Please find below patches to catch an unhandled exception as reported in bug
24368. I have included patches for TC4 and TC5. The TC4 patch also includes
removing some unused imports (thanks to Eclipse :) )
Grateful if one of the committers could apply them.
Thanks,
Mark
TC4 patch follows:
Index:
catalina/src/share/org/apache/catalina/session/PersistentManagerBase.java
===================================================================
RCS file:
/home/cvspublic/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/se
ssion/PersistentManagerBase.java,v
retrieving revision 1.13
diff -u -r1.13 PersistentManagerBase.java
---
catalina/src/share/org/apache/catalina/session/PersistentManagerBase.java 11
Feb 2003 11:54:12 -0000 1.13
+++ catalina/src/share/org/apache/catalina/session/PersistentManagerBase.java 9
Nov 2003 20:07:49 -0000
@@ -66,30 +66,12 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeSupport;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.InputStream;
import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.ObjectStreamClass;
-import java.util.ArrayList;
-import java.util.Iterator;
-import javax.servlet.ServletContext;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
-import org.apache.catalina.Globals;
import org.apache.catalina.Lifecycle;
-import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
-import org.apache.catalina.Loader;
-import org.apache.catalina.Manager;
import org.apache.catalina.Session;
import org.apache.catalina.Store;
import org.apache.catalina.util.LifecycleSupport;
@@ -897,7 +879,11 @@
StandardSession session = (StandardSession) sessions[i];
if (!session.isValid())
continue;
- session.expire();
+ try {
+ session.expire();
+ } catch (Throwable t) {
+ ;
+ }
}
}
TC5 patch follows:
Index:
catalina/src/share/org/apache/catalina/session/PersistentManagerBase.java
===================================================================
RCS file:
/home/cvspublic/jakarta-tomcat-catalina/catalina/src/share/org/apache/catali
na/session/PersistentManagerBase.java,v
retrieving revision 1.11
diff -u -r1.11 PersistentManagerBase.java
--- catalina/src/share/org/apache/catalina/session/PersistentManagerBase.java 8
Sep 2003 15:25:18 -0000 1.11
+++ catalina/src/share/org/apache/catalina/session/PersistentManagerBase.java 9
Nov 2003 20:02:31 -0000
@@ -996,7 +996,11 @@
StandardSession session = (StandardSession) sessions[i];
if (!session.isValid())
continue;
- session.expire();
+ try {
+ session.expire();
+ } catch (Throwable t) {
+ ;
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
