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

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

Author: chiba
Date: 2012-07-30 08:59:07 -0400 (Mon, 30 Jul 2012)
New Revision: 641

Modified:
   trunk/javassist.jar
   trunk/src/main/javassist/bytecode/SignatureAttribute.java
   trunk/src/test/javassist/JvstTest4.java
Log:
fixed JASSIST-171

Modified: trunk/javassist.jar
===================================================================
(Binary files differ)

Modified: trunk/src/main/javassist/bytecode/SignatureAttribute.java
===================================================================
--- trunk/src/main/javassist/bytecode/SignatureAttribute.java	2012-06-17 15:57:19 UTC (rev 640)
+++ trunk/src/main/javassist/bytecode/SignatureAttribute.java	2012-07-30 12:59:07 UTC (rev 641)
@@ -1066,7 +1066,7 @@
             targs = null;
 
         ClassType thisClass = ClassType.make(sig, start, end, targs, parent);
-        if (t == '$') {
+        if (t == '$' || t == '.') {
             c.position--;
             return parseClassType2(sig, c, thisClass);
         }

Modified: trunk/src/test/javassist/JvstTest4.java
===================================================================
--- trunk/src/test/javassist/JvstTest4.java	2012-06-17 15:57:19 UTC (rev 640)
+++ trunk/src/test/javassist/JvstTest4.java	2012-07-30 12:59:07 UTC (rev 641)
@@ -762,4 +762,16 @@
         java.lang.reflect.Method rm2 = clazz.getDeclaredMethod("set", new Class[] { Object.class });
         assertEquals("T", ((java.lang.reflect.TypeVariable)rm2.getGenericParameterTypes()[0]).getName());
     }
+
+    public void testJIRA171() throws Exception {
+        SignatureAttribute.MethodSignature ms
+            = SignatureAttribute.toMethodSignature("(Ljava/lang/Object;Lorg/apache/hadoop/io/Text;"
+              + "Lorg/apache/hadoop/mapreduce/Mapper<Ljava/lang/Object;Lorg/apache/hadoop/io/Text;"
+              + "Lorg/apache/hadoop/io/Text;Lorg/apache/hadoop/io/IntWritable;>.Context;)V");
+        String s = ms.toString();
+        System.out.println(s);
+        assertEquals("<> (java.lang.Object, org.apache.hadoop.io.Text, "
+                     + "org.apache.hadoop.mapreduce.Mapper<java.lang.Object, org.apache.hadoop.io.Text, "
+                     + "org.apache.hadoop.io.Text, org.apache.hadoop.io.IntWritable>.Context) void", s);
+    }
 }