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

[djencks]

djencks     2005/02/04 23:23:50

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

  Fixing part of my last change, the TCCL may be useless
  
  Revision  Changes    Path
  1.4       +7 -2      
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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- EJBObjectInputStream.java 5 Feb 2005 00:48:58 -0000       1.3
  +++ EJBObjectInputStream.java 5 Feb 2005 04:23:48 -0000       1.4
  @@ -74,8 +74,13 @@
       protected Class resolveClass(ObjectStreamClass desc)

           throws IOException, ClassNotFoundException {

           if (ejbClassLoader == null) {

  +            //TODO is the TCCL every going to be set at this point?

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

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

  +            try {

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

  +            } catch (ClassNotFoundException e) {

  +                return super.resolveClass(desc);

  +            }

           }

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

       }