You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by ha...@apache.org on 2002/02/18 22:25:24 UTC
cvs commit: jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/common ClassLoaderObjectInputStream.java
hammant 02/02/18 13:25:24
Modified: altrmi/src/java/org/apache/commons/altrmi/common
ClassLoaderObjectInputStream.java
Log:
improved fallback scenario by Vinay
Revision Changes Path
1.2 +19 -20 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/common/ClassLoaderObjectInputStream.java
Index: ClassLoaderObjectInputStream.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/common/ClassLoaderObjectInputStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ClassLoaderObjectInputStream.java 2 Feb 2002 23:39:41 -0000 1.1
+++ ClassLoaderObjectInputStream.java 18 Feb 2002 21:25:24 -0000 1.2
@@ -22,32 +22,31 @@
* @author <a href="mailto:paul_hammant@yahoo.com">Paul Hammant</a>
*/
public class ClassLoaderObjectInputStream
- extends ObjectInputStream
-{
- private ClassLoader m_classLoader;
+ extends ObjectInputStream {
+ private ClassLoader mClassLoader;
- public ClassLoaderObjectInputStream( final ClassLoader classLoader,
- final InputStream inputStream )
- throws IOException, StreamCorruptedException
- {
- super( inputStream );
- m_classLoader = classLoader;
+ public ClassLoaderObjectInputStream(final ClassLoader classLoader,
+ final InputStream inputStream)
+ throws IOException, StreamCorruptedException {
+ super(inputStream);
+ mClassLoader = classLoader;
}
- protected Class resolveClass( final ObjectStreamClass objectStreamClass )
- throws IOException, ClassNotFoundException
- {
- final Class clazz =
- Class.forName( objectStreamClass.getName(), false, m_classLoader );
+ protected Class resolveClass(final ObjectStreamClass objectStreamClass)
+ throws IOException, ClassNotFoundException {
- if( null != clazz )
- {
- return clazz; // the classloader knows of the class
+ Class clazz = null;
+ try {
+ clazz =
+ Class.forName(objectStreamClass.getName(), false, mClassLoader);
+ } catch (ClassNotFoundException cnfe) {
}
- else
- {
+
+ if (null != clazz) {
+ return clazz; // the classloader knows of the class
+ } else {
// classloader knows not of class, let the super classloader do it
- return super.resolveClass( objectStreamClass );
+ return super.resolveClass(objectStreamClass);
}
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>