remm 2005/06/16 02:50:12
Modified: catalina/src/share/org/apache/catalina/session
StandardSession.java StandardManager.java
Log:
- 34760: Passivating session should not make stop fail.
Revision Changes Path
1.60 +3 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/StandardSession.java
Index: StandardSession.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/StandardSession.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- StandardSession.java 15 Jun 2005 23:50:12 -0000 1.59
+++ StandardSession.java 16 Jun 2005 09:50:12 -0000 1.60
@@ -53,6 +53,7 @@
import org.apache.catalina.util.StringManager;
import org.apache.catalina.security.SecurityUtil;
+
/**
* Standard implementation of the <b>Session</b> interface. This object is
* serializable, so that it can be stored in persistent storage or
transferred
@@ -1452,7 +1453,7 @@
saveNames.add(keys[i]);
saveValues.add(value);
} else {
- removeAttribute(keys[i]);
+ removeAttributeInternal(keys[i], true);
}
}
1.31 +3 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/StandardManager.java
Index: StandardManager.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/StandardManager.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- StandardManager.java 31 Mar 2005 10:31:53 -0000 1.30
+++ StandardManager.java 16 Jun 2005 09:50:12 -0000 1.31
@@ -664,8 +664,8 @@
// Write out sessions
try {
unload();
- } catch (IOException e) {
- log.error(sm.getString("standardManager.managerUnload"), e);
+ } catch (Throwable t) {
+ log.error(sm.getString("standardManager.managerUnload"), t);
}
// Expire all active sessions
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
