jfarcand    2003/11/13 14:56:27

  Modified:    catalina/src/share/org/apache/catalina/session
                        PersistentManagerBase.java
  Log:
  Return the object instead of a null. Throw the proper exception. Cut/Paste should 
not exists....
  
  Revision  Changes    Path
  1.12      +10 -7     
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/PersistentManagerBase.java
  
  Index: PersistentManagerBase.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/PersistentManagerBase.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- PersistentManagerBase.java        8 Sep 2003 15:25:18 -0000       1.11
  +++ PersistentManagerBase.java        13 Nov 2003 22:56:27 -0000      1.12
  @@ -140,8 +140,7 @@
           }
   
           public Object run() throws Exception{
  -           store.load(id);
  -           return null;
  +           return store.load(id);
           }                       
       }   
             
  @@ -802,7 +801,11 @@
                   }catch(PrivilegedActionException ex){
                       Exception exception = ex.getException();
                       log.error("Exception clearing the Store: " + exception);
  -                    exception.printStackTrace();                        
  +                    if (exception instanceof IOException){
  +                        throw (IOException)exception;
  +                    } else if (exception instanceof ClassNotFoundException) {
  +                        throw (ClassNotFoundException)exception;
  +                    }
                   }
               } else {
                    session = store.load(id);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to