[openejb-scm] openejb/modules/core/src/java/org/openejb/server/ejbd EJBObjectInputStream.java

[djencks]

djencks     2005/02/04 19:48:58

  Modified:    modules/core/src/java/org/openejb/server/ejbd
                        EJBObjectInputStream.java
  Log:

  use a classloading method that can load arrays types based on classes in our 
classloader
  
  Revision  Changes    Path
  1.3       +5 -11     
openejb/modules/core/src/java/org/openejb/server/ejbd/EJBObjectInputStream.java
  
  Index: EJBObjectInputStream.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/server/ejbd/EJBObjectInputStream.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- EJBObjectInputStream.java 29 Sep 2004 03:39:44 -0000      1.2
  +++ EJBObjectInputStream.java 5 Feb 2005 00:48:58 -0000       1.3
  @@ -49,6 +49,8 @@
   import java.io.ObjectInputStream;

   import java.io.ObjectStreamClass;

   

  +import org.apache.geronimo.kernel.ClassLoading;

  +

   public class EJBObjectInputStream extends ObjectInputStream {

   

       private ClassLoader ejbClassLoader;

  @@ -73,17 +75,9 @@
           throws IOException, ClassNotFoundException {

           if (ejbClassLoader == null) {

               ClassLoader contextClassLoader = 
Thread.currentThread().getContextClassLoader();

  -            try {

  -                return contextClassLoader.loadClass(desc.getName());

  -            } catch (ClassNotFoundException e) {

  -                return super.resolveClass(desc);

  -            }

  -        }

  -        try {

  -            return ejbClassLoader.loadClass(desc.getName());

  -        } catch (ClassNotFoundException e) {

  -            return super.resolveClass(desc);

  +            return ClassLoading.loadClass(desc.getName(), 
contextClassLoader);

           }

  +        return ClassLoading.loadClass(desc.getName(), ejbClassLoader);

       }

   

   }