[jboss-cvs] javassist SVN: r593 - in trunk/src: test/javassist and 1 other directory.

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

Author: chiba
Date: 2011-10-19 00:54:56 -0400 (Wed, 19 Oct 2011)
New Revision: 593

Modified:
   trunk/src/main/javassist/bytecode/stackmap/TypeData.java
   trunk/src/test/javassist/JvstTest4.java
Log:
fixed JASSIST-145

Modified: trunk/src/main/javassist/bytecode/stackmap/TypeData.java
===================================================================
--- trunk/src/main/javassist/bytecode/stackmap/TypeData.java	2011-10-18 16:10:30 UTC (rev 592)
+++ trunk/src/main/javassist/bytecode/stackmap/TypeData.java	2011-10-19 04:54:56 UTC (rev 593)
@@ -400,6 +400,10 @@
             return new ArrayElement(array);
         }
 
+        public boolean isNullType() {
+            return array.isNullType();
+        }
+
         protected void setType(String typeName, ClassPool cp) throws BadBytecode {
             super.setType(typeName, cp);
             array.setType(getArrayType(typeName), cp);

Modified: trunk/src/test/javassist/JvstTest4.java
===================================================================
--- trunk/src/test/javassist/JvstTest4.java	2011-10-18 16:10:30 UTC (rev 592)
+++ trunk/src/test/javassist/JvstTest4.java	2011-10-19 04:54:56 UTC (rev 593)
@@ -495,7 +495,9 @@
         for (CtClass c: tab) {
             System.err.println(c.getName());
         }
-        assertEquals(4, tab.length);
+
+        // Eclipse compiler sets tab.length to 4 but javac sets to 3. 
+        assertTrue(tab.length == 4 || tab.length == 3);
         for (CtClass c: tab) {
             String name = c.getName();
             assertTrue(name.equals("test4.NestedClass$N")
@@ -512,7 +514,9 @@
     public void testGetClasses() throws Exception {
         CtClass cc = sloader.get("test4.NestedClass");
         CtClass[] tab = cc.getDeclaredClasses();
-        assertEquals(4, tab.length);
+
+        // Eclipse compiler sets tab.length to 4 but javac sets to 3. 
+        assertTrue(tab.length == 4 || tab.length == 3);
         for (CtClass c: tab) {
             String name = c.getName();
             assertTrue(name.equals("test4.NestedClass$N")