You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by bi...@apache.org on 2001/05/03 22:45:06 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session StandardManager.java
bip 01/05/03 13:45:05
Modified: catalina/src/share/org/apache/catalina/session
StandardManager.java
Log:
Changed StandardManager to use the org.apache.util.CustomObjectInputStream
instead of the inline CustomObjectInputStream.
Revision Changes Path
1.10 +5 -62 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- StandardManager.java 2001/04/17 17:07:04 1.9
+++ StandardManager.java 2001/05/03 20:45:03 1.10
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardManager.java,v 1.9 2001/04/17 17:07:04 craigmcc Exp $
- * $Revision: 1.9 $
- * $Date: 2001/04/17 17:07:04 $
+ * $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 $
*
* ====================================================================
*
@@ -91,6 +91,7 @@
import org.apache.catalina.Loader;
import org.apache.catalina.Manager;
import org.apache.catalina.Session;
+import org.apache.catalina.util.CustomObjectInputStream;
import org.apache.catalina.util.LifecycleSupport;
@@ -105,7 +106,7 @@
* <code>stop()</code> methods of this class at the correct times.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.9 $ $Date: 2001/04/17 17:07:04 $
+ * @version $Revision: 1.10 $ $Date: 2001/05/03 20:45:03 $
*/
public class StandardManager
@@ -815,62 +816,4 @@
}
}
-
-
- // -------------------------------------------------------- Private Classes
-
-
- /**
- * Custom subclass of <code>ObjectInputStream</code> that loads from the
- * class loader for this web application. This allows classes defined only
- * with the web application to be found correctly.
- */
- private static final class CustomObjectInputStream
- extends ObjectInputStream {
-
-
- /**
- * The class loader we will use to resolve classes.
- */
- private ClassLoader classLoader = null;
-
-
- /**
- * Construct a new instance of CustomObjectInputStream
- *
- * @param stream The input stream we will read from
- * @param classLoader The class loader used to instantiate objects
- *
- * @exception IOException if an input/output error occurs
- */
- public CustomObjectInputStream(InputStream stream,
- ClassLoader classLoader)
- throws IOException {
-
- super(stream);
- this.classLoader = classLoader;
-
- }
-
-
- /**
- * Load the local class equivalent of the specified stream class
- * description, by using the class loader assigned to this Context.
- *
- * @param classDesc Class description from the input stream
- *
- * @exception ClassNotFoundException if this class cannot be found
- * @exception IOException if an input/output error occurs
- */
- protected Class resolveClass(ObjectStreamClass classDesc)
- throws ClassNotFoundException, IOException {
-
- return (classLoader.loadClass(classDesc.getName()));
-
- }
-
-
- }
-
-
}