replaced individual calls to Thread.currentThread().getContextClassLoader() with a call to ClassPool#getContextClassLoader(), which simply forward to Thread.current...

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

1 files changed, 3 insertions, 2 deletions

diff --git a/src/main/javassist/CtClassType.java b/src/main/javassist/CtClassType.java
index d4830676..cf41cc27 100644
--- 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);
         }