mx4j/src/core/mx4j/loading ClassLoaderObjectInputStream.java,1.5,1.6

Update of /cvsroot/mx4j/mx4j/src/core/mx4j/loading
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20773/src/core/mx4j/loading

Modified Files:
	ClassLoaderObjectInputStream.java 
Log Message:
Fix for when mx4j is in bootclasspath: allow null classloader

Index: ClassLoaderObjectInputStream.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/core/mx4j/loading/ClassLoaderObjectInputStream.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ClassLoaderObjectInputStream.java	13 Nov 2004 16:38:32 -0000	1.5
--- ClassLoaderObjectInputStream.java	21 Nov 2004 14:03:28 -0000	1.6
***************
*** 35,39 ****
     {
        super(stream);
-       if (classLoader == null) throw new IllegalArgumentException("Classloader cannot be null");
        this.classLoader = classLoader;
     }
--- 35,38 ----
***************
*** 55,59 ****
     private Class loadClass(String name) throws ClassNotFoundException
     {
!       return classLoader.loadClass(name);
     }
  }
--- 54,61 ----
     private Class loadClass(String name) throws ClassNotFoundException
     {
!       if (classLoader != null)
!          return classLoader.loadClass(name);
!       else
!          return Class.forName(name, true, null);
     }
  }



-------------------------------------------------------
This SF.Net email is sponsored by: InterSystems CACHE
FREE OODBMS DOWNLOAD - A multidimensional database that combines
robust object and relational technologies, making it a perfect match
for Java, C++,COM, XML, ODBC and JDBC. www.intersystems.com/match8