fixed JASSIST-158

diff --git a/src/main/javassist/compiler/MemberCodeGen.java b/src/main/javassist/compiler/MemberCodeGen.java
index 3ea68eb1608ad90590079279457ad12dbe5bc63f..167e4cccf4f490068d9e21e50b77bef92450cbfe 100644 (file)
--- a/src/main/javassist/compiler/MemberCodeGen.java
+++ b/src/main/javassist/compiler/MemberCodeGen.java
@@ -957,7 +957,7 @@ public class MemberCodeGen extends CodeGen {
         else
             className = null;
 
-        boolean is2byte = (c == 'J' || c == 'D');
+        boolean is2byte = dim == 0 && (c == 'J' || c == 'D');
         return is2byte;
     }
 

diff --git a/src/test/javassist/JvstTest4.java b/src/test/javassist/JvstTest4.java
index 8bcbf01c7362deaabf25f1a3b566a405630a4f04..b3b04c29471915efefdeddc3f3a4e5248b06606b 100644 (file)
--- a/src/test/javassist/JvstTest4.java
+++ b/src/test/javassist/JvstTest4.java
@@ -895,4 +895,12 @@ public class JvstTest4 extends JvstTestRoot {
         cc.addMethod(CtNewMethod.make(
                 "public int getf(test4.JIRA188 p){ return p.g; }", cc));
     }
+
+    public void testJIRA158() throws Exception {
+        CtClass cc = sloader.get("test4.JIRA158");
+        cc.addMethod(CtMethod.make("public int run() { return obj.foo(jj, dd) + obj.bar(j, d); }", cc));
+        cc.writeFile();
+        Object obj = make(cc.getName());
+        assertEquals(15, invoke(obj, "run"));
+    }
 }