[jboss-cvs] javassist/src/main/javassist/util/proxy ...

[Shigeru Chiba]

  User: chiba   
  Date: 06/10/29 18:33:15

  Modified:    src/main/javassist/util/proxy  ProxyFactory.java
  Log:
  StackMapTable support (not complete)
  
  Revision  Changes    Path
  1.16      +6 -4      javassist/src/main/javassist/util/proxy/ProxyFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ProxyFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/javassist/src/main/javassist/util/proxy/ProxyFactory.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- ProxyFactory.java	1 Sep 2006 03:04:43 -0000	1.15
  +++ ProxyFactory.java	29 Oct 2006 23:33:15 -0000	1.16
  @@ -209,7 +209,7 @@
       /**
        * A provider used by <code>createClass()</code> for obtaining
        * a class loader.
  -     * <code>get()</code> on this <code>ClassLoaderGetter</code> object
  +     * <code>get()</code> on this <code>ClassLoaderProvider</code> object
        * is called to obtain a class loader.
        *
        * <p>The value of this field can be updated for changing the default
  @@ -238,7 +238,6 @@
       }
   
       protected ClassLoader getClassLoader0() {
  -        // return Thread.currentThread().getContextClassLoader();
           ClassLoader loader = null;
           if (superClass != null && !superClass.getName().equals("java.lang.Object"))
               loader = superClass.getClassLoader();
  @@ -248,9 +247,12 @@
           if (loader == null) {
               loader = getClass().getClassLoader();
               // In case javassist is in the endorsed dir
  +            if (loader == null) {
  +                loader = Thread.currentThread().getContextClassLoader();
               if (loader == null)
                  loader = ClassLoader.getSystemClassLoader();
           }
  +        }
   
           return loader;
       }