You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@avalon.apache.org by do...@apache.org on 2001/04/16 11:51:32 UTC
cvs commit: jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/masterstore FileStoreObjectInputStream.java
donaldp 01/04/16 02:51:32
Modified: src/java/org/apache/cornerstone/blocks/masterstore
FileStoreObjectInputStream.java
Log:
Cleaned style.
Revision Changes Path
1.3 +20 -12 jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/masterstore/FileStoreObjectInputStream.java
Index: FileStoreObjectInputStream.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/src/java/org/apache/cornerstone/blocks/masterstore/FileStoreObjectInputStream.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FileStoreObjectInputStream.java 2001/03/20 21:31:15 1.2
+++ FileStoreObjectInputStream.java 2001/04/16 09:51:32 1.3
@@ -21,25 +21,33 @@
*
* @author <a href="mailto:paul_hammant@yahoo.com">Paul Hammant</a>
*/
-
-class FileStoreObjectInputStream extends ObjectInputStream
+class FileStoreObjectInputStream
+ extends ObjectInputStream
{
- private ClassLoader classLoader;
- public FileStoreObjectInputStream(ClassLoader classLoader, InputStream in) throws IOException, StreamCorruptedException
+ private ClassLoader m_classLoader;
+
+ public FileStoreObjectInputStream( final ClassLoader classLoader,
+ final InputStream inputStream )
+ throws IOException, StreamCorruptedException
{
- super(in);
- this.classLoader = classLoader;
+ super( inputStream );
+ m_classLoader = classLoader;
}
- protected Class resolveClass(ObjectStreamClass v) throws IOException, ClassNotFoundException
+
+ protected Class resolveClass( final ObjectStreamClass objectStreamClass )
+ throws IOException, ClassNotFoundException
{
- Class cl = Class.forName(v.getName(), false, classLoader);
- if (cl !=null)
+ final Class clazz =
+ Class.forName( objectStreamClass.getName(), false, m_classLoader );
+
+ if( null != clazz )
{
- return cl; // the classloader knows of the class
+ return clazz; // the classloader knows of the class
}
else
{
- return super.resolveClass(v); // classloader knows not of class, let the super classloader do it
+ // classloader knows not of class, let the super classloader do it
+ return super.resolveClass( objectStreamClass );
}
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: avalon-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: avalon-dev-help@jakarta.apache.org