replaced individual calls to Thread.currentThread().getContextClassLoader() with...

git-svn-id: http://anonsvn.jboss.org/repos/javassist/trunk@249 30ef5769-5b8d-40dd-aea6-55b5d6557bb3

diff --git a/src/main/javassist/ClassPool.java b/src/main/javassist/ClassPool.java
index b0d8f9e9737d55473624d50f72947e30f367836b..25332d76c885c94178a69539b48d9a02070bcf28 100644 (file)
--- a/src/main/javassist/ClassPool.java
+++ b/src/main/javassist/ClassPool.java
@@ -762,7 +762,15 @@ public class ClassPool {
      * @see #toClass(CtClass, java.lang.ClassLoader)
      */
     public Class toClass(CtClass clazz) throws CannotCompileException {
-        return toClass(clazz, Thread.currentThread().getContextClassLoader());
+        return toClass(clazz, getContextClassLoader()); 
+    }
+
+    /**
+     * Obtains a class loader that seems appropriate to look up a class
+     * by name. 
+     */
+    static ClassLoader getContextClassLoader() {
+        return Thread.currentThread().getContextClassLoader();
     }
 
     /**

diff --git a/src/main/javassist/CtClassType.java b/src/main/javassist/CtClassType.java
index d48306762e731b1e4d36e774f83bbbae0867c87b..cf41cc270a380af4a88deb79e2facf8971f17eb4 100644 (file)
--- a/src/main/javassist/CtClassType.java
+++ b/src/main/javassist/CtClassType.java
@@ -411,7 +411,7 @@ class CtClassType extends CtClass {
         }
 
         Object[] result = new Object[size1 + size2];
-        ClassLoader cl = Thread.currentThread().getContextClassLoader();
+        ClassLoader cl = ClassPool.getContextClassLoader();
         for (int i = 0; i < size1; i++)
             result[i] = anno1[i].toAnnotationType(cl, cp);
 
@@ -434,7 +434,7 @@ class CtClassType extends CtClass {
            return new Object[0][];
 
         Object[][] result = new Object[numParameters][];
-        ClassLoader cl = Thread.currentThread().getContextClassLoader();
+        ClassLoader cl = ClassPool.getContextClassLoader();
         for (int i = 0; i < numParameters; i++) {
             Annotation[] anno1, anno2;
             int size1, size2;
@@ -460,6 +460,7 @@ class CtClassType extends CtClass {
             result[i] = new Object[size1 + size2];
             for (int j = 0; j < size1; ++j)
                result[i][j] = anno1[j].toAnnotationType(cl, cp);
+
             for (int j = 0; j < size2; ++j)
                result[i][j + size1] = anno2[j].toAnnotationType(cl, cp);
         }