[jboss-cvs] javassist SVN: r616 - in trunk: src/main/javassist/runtime and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: chiba
Date: 2012-02-19 08:06:30 -0500 (Sun, 19 Feb 2012)
New Revision: 616

Modified:
   trunk/Readme.html
   trunk/src/main/javassist/runtime/Desc.java
   trunk/src/test/javassist/JvstTest4.java
Log:
fixed JASSIST-151

Modified: trunk/Readme.html
===================================================================
--- trunk/Readme.html	2012-02-19 12:41:47 UTC (rev 615)
+++ trunk/Readme.html	2012-02-19 13:06:30 UTC (rev 616)
@@ -283,7 +283,7 @@
 
 <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>
 

Modified: trunk/src/main/javassist/runtime/Desc.java
===================================================================
--- trunk/src/main/javassist/runtime/Desc.java	2012-02-19 12:41:47 UTC (rev 615)
+++ trunk/src/main/javassist/runtime/Desc.java	2012-02-19 13:06:30 UTC (rev 616)
@@ -38,8 +38,7 @@
         throws ClassNotFoundException
     {
         if (useContextClassLoader)
-            return Thread.currentThread().getContextClassLoader()
-                   .loadClass(name);
+            return Class.forName(name, true, Thread.currentThread().getContextClassLoader());
         else
             return Class.forName(name);
     }

Modified: trunk/src/test/javassist/JvstTest4.java
===================================================================
--- trunk/src/test/javassist/JvstTest4.java	2012-02-19 12:41:47 UTC (rev 615)
+++ trunk/src/test/javassist/JvstTest4.java	2012-02-19 13:06:30 UTC (rev 616)
@@ -701,4 +701,14 @@
         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;
+    }
 }