You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by jo...@apache.org on 2001/06/23 00:03:36 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session StandardManager.java
jon 01/06/22 15:03:36
Modified: catalina/src/share/org/apache/catalina/session
StandardManager.java
Log:
please check this patch!
#1. make sure the file is deleted if there is an error.
#2. move the ois.close() into the finally block to also ensure it is
closed on error.
#3. improve the logging messages
Revision Changes Path
1.11 +18 -17 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardManager.java
Index: StandardManager.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- StandardManager.java 2001/05/03 20:45:03 1.10
+++ StandardManager.java 2001/06/22 22:03:35 1.11
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardManager.java,v 1.10 2001/05/03 20:45:03 bip Exp $
- * $Revision: 1.10 $
- * $Date: 2001/05/03 20:45:03 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardManager.java,v 1.11 2001/06/22 22:03:35 jon Exp $
+ * $Revision: 1.11 $
+ * $Date: 2001/06/22 22:03:35 $
*
* ====================================================================
*
@@ -106,7 +106,7 @@
* <code>stop()</code> methods of this class at the correct times.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.10 $ $Date: 2001/05/03 20:45:03 $
+ * @version $Revision: 1.11 $ $Date: 2001/06/22 22:03:35 $
*/
public class StandardManager
@@ -349,7 +349,7 @@
public void load() throws ClassNotFoundException, IOException {
if (debug >= 1)
- log("Loading persisted sessions");
+ log("Start: Loading persisted sessions");
// Initialize our internal data structures
recycled.clear();
@@ -432,22 +432,23 @@
ois = null;
}
throw e;
- }
- }
+ } finally {
+ // Close the input stream
+ try {
+ if (ois != null)
+ ois.close();
+ } catch (IOException f) {
+ // ignored
+ }
- // Close the input stream
- try {
- ois.close();
- } catch (IOException f) {
- ;
+ // Delete the persistent storage file
+ if (file != null && file.exists() )
+ file.delete();
+ }
}
- // Delete the persistent storage file
- file.delete();
-
if (debug >= 1)
- log("Loading complete");
-
+ log("Finish: Loading persisted sessions");
}