craigmcc 01/09/15 16:37:52
Modified: catalina/src/share/org/apache/catalina/session
StandardManager.java
Log:
When processing StandardManager.stop(), catch and ignore any exceptions
thrown by StandardSession.expire() that would otherwise abort an orderly
shutdown of the manager.
Submitted by: Daved Lecomber <[EMAIL PROTECTED]>
Revision Changes Path
1.15 +9 -5
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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- StandardManager.java 2001/09/14 17:48:59 1.14
+++ StandardManager.java 2001/09/15 23:37:52 1.15
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardManager.java,v
1.14 2001/09/14 17:48:59 craigmcc Exp $
- * $Revision: 1.14 $
- * $Date: 2001/09/14 17:48:59 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardManager.java,v
1.15 2001/09/15 23:37:52 craigmcc Exp $
+ * $Revision: 1.15 $
+ * $Date: 2001/09/15 23:37:52 $
*
* ====================================================================
*
@@ -106,7 +106,7 @@
* <code>stop()</code> methods of this class at the correct times.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.14 $ $Date: 2001/09/14 17:48:59 $
+ * @version $Revision: 1.15 $ $Date: 2001/09/15 23:37:52 $
*/
public class StandardManager
@@ -662,7 +662,11 @@
StandardSession session = (StandardSession) sessions[i];
if (!session.isValid())
continue;
- session.expire();
+ try {
+ session.expire();
+ } catch (Throwable t) {
+ ;
+ }
}
// Require a new random number generator if we are restarted
