fixed JASSIST-145

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

diff --git a/src/main/javassist/bytecode/stackmap/TypeData.java b/src/main/javassist/bytecode/stackmap/TypeData.java
index c7721b0cc534f21a68979e707e22c7840e9ce1bc..65ab226e3ba02bcc41c86e195c08e1768214ae74 100644 (file)
--- a/src/main/javassist/bytecode/stackmap/TypeData.java
+++ b/src/main/javassist/bytecode/stackmap/TypeData.java
@@ -400,6 +400,10 @@ public abstract class TypeData {
             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);

diff --git a/src/test/javassist/JvstTest4.java b/src/test/javassist/JvstTest4.java
index 9ea097430e10a66788e78afe0d602572fa1d1ba6..67c229fa657acaeeb700bf1fc4580c8433591798 100644 (file)
--- a/src/test/javassist/JvstTest4.java
+++ b/src/test/javassist/JvstTest4.java
@@ -495,7 +495,9 @@ public class JvstTest4 extends JvstTestRoot {
         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 class JvstTest4 extends JvstTestRoot {
     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")