added a test to make sure primitives work (they do), and also tidied up the array...

diff --git a/weaver/src/org/aspectj/weaver/reflect/ReflectionWorld.java b/weaver/src/org/aspectj/weaver/reflect/ReflectionWorld.java
index 789dc580600fb9c818c595c0623a033507168ce5..6ffc84b5155851ddf0c6ee3aafe6499cd9128a8c 100644 (file)
--- a/weaver/src/org/aspectj/weaver/reflect/ReflectionWorld.java
+++ b/weaver/src/org/aspectj/weaver/reflect/ReflectionWorld.java
@@ -46,11 +46,12 @@ public class ReflectionWorld extends World {
        public ResolvedType resolve(Class aClass) {
                // classes that represent arrays return a class name that is the signature of the array type, ho-hum...
                String className = aClass.getName();
-               if (!className.startsWith("[")) {
-                       return resolve(className);
-               } else {
+               if (aClass.isArray()) {
                        return resolve(UnresolvedType.forSignature(className));
                }
+               else{
+                       return resolve(className);
+               } 
        }
        
        /* (non-Javadoc)

diff --git a/weaver/testsrc/org/aspectj/weaver/reflect/ReflectionWorldTest.java b/weaver/testsrc/org/aspectj/weaver/reflect/ReflectionWorldTest.java
index 4bc879daed7d06c6eb2ccc95892819278815ecbc..662d9beb25816506824e86139580d15519ba87f3 100644 (file)
--- a/weaver/testsrc/org/aspectj/weaver/reflect/ReflectionWorldTest.java
+++ b/weaver/testsrc/org/aspectj/weaver/reflect/ReflectionWorldTest.java
@@ -33,4 +33,10 @@ public class ReflectionWorldTest extends TestCase {
                assertTrue(rt.isArray());
        }
        
+       public void testPrimitiveTypes() {
+               ReflectionWorld world = new ReflectionWorld();
+               assertEquals("int",ResolvedType.INT,world.resolve(int.class));
+               assertEquals("void",ResolvedType.VOID,world.resolve(void.class));
+       }
+       
 }