fixed JASSIST-151

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

diff --git a/Readme.html b/Readme.html
index 022268c52dbf517db27d46f181e6cf30770e7790..af8197f2a7c647e540696e85248e043ec5474b4d 100644 (file)
--- a/Readme.html
+++ b/Readme.html
@@ -283,7 +283,7 @@ see javassist.Dump.
 
 <p>-version 3.16
 <ul>
-       <li>JIRA JASSIST-126, 127, 144, 145, 146, 147, 149, 150, 152, 153, 155.
+       <li>JIRA JASSIST-126, 127, 144, 145, 146, 147, 149, 150, 151, 152, 153, 155.
        <li><code>javassist.bytecode.analysis.ControlFlow</code> was added.
 </ul>
 

diff --git a/src/main/javassist/runtime/Desc.java b/src/main/javassist/runtime/Desc.java
index ee20d059a4edc5e717fa5bd2ad15f33f4a2e3bb1..0b1cef518f4f777381f10f56b051862ca6c6d4e7 100644 (file)
--- a/src/main/javassist/runtime/Desc.java
+++ b/src/main/javassist/runtime/Desc.java
@@ -38,8 +38,7 @@ public class Desc {
         throws ClassNotFoundException
     {
         if (useContextClassLoader)
-            return Thread.currentThread().getContextClassLoader()
-                   .loadClass(name);
+            return Class.forName(name, true, Thread.currentThread().getContextClassLoader());
         else
             return Class.forName(name);
     }

diff --git a/src/test/javassist/JvstTest4.java b/src/test/javassist/JvstTest4.java
index a3c47ee141537b23dd45b6a7c3437adec4b02a20..1f3612d8cc67311e8e8d9db7c7bf69c259b15ba7 100644 (file)
--- a/src/test/javassist/JvstTest4.java
+++ b/src/test/javassist/JvstTest4.java
@@ -701,4 +701,14 @@ public class JvstTest4 extends JvstTestRoot {
         Object obj = make(cc.getName());
         assertEquals(1, invoke(obj, "test"));
     }
+
+    public void testJIRA151() {
+        // try it using classloader of TestDescForName Desc.useContextClassLoader = false;
+        assertTrue(javassist.runtime.Desc.getClazz("[Ljava.lang.String;") != null);
+        //Thread.currentThread().setContextClassLoader(TestDescForName.class.getClassLoader());
+        boolean old = javassist.runtime.Desc.useContextClassLoader;
+        javassist.runtime.Desc.useContextClassLoader = true;
+        assertTrue(javassist.runtime.Desc.getClazz("[Ljava.lang.String;") != null);
+        javassist.runtime.Desc.useContextClassLoader = old;
+    }
 }