fix for NPE in SignatureImpl reported on the list by Simon Walter

diff --git a/lib/aspectj/lib/aspectjrt.jar b/lib/aspectj/lib/aspectjrt.jar
index 77308ed31ad91c3cdf2e6130855304b364e142a7..01aac118057ae5d3cb9afd17687d4b00f4f5230f 100644 (file)
Binary files a/lib/aspectj/lib/aspectjrt.jar and b/lib/aspectj/lib/aspectjrt.jar differ

diff --git a/lib/test/aspectjrt.jar b/lib/test/aspectjrt.jar
index 77308ed31ad91c3cdf2e6130855304b364e142a7..01aac118057ae5d3cb9afd17687d4b00f4f5230f 100644 (file)
Binary files a/lib/test/aspectjrt.jar and b/lib/test/aspectjrt.jar differ

diff --git a/runtime/src/org/aspectj/runtime/reflect/SignatureImpl.java b/runtime/src/org/aspectj/runtime/reflect/SignatureImpl.java
index cb5b269ef5d2f0d59bdc83393dc3eb398fa00f58..5dd0248552d9e65c743f6267a75fcfbfc878dbaa 100644 (file)
--- a/runtime/src/org/aspectj/runtime/reflect/SignatureImpl.java
+++ b/runtime/src/org/aspectj/runtime/reflect/SignatureImpl.java
@@ -213,7 +213,11 @@ abstract class SignatureImpl implements Signature {
                }
                
                public String get(int cacheOffset) {
-                       return array()[cacheOffset];
+          String[] cachedArray = array();
+          if (cachedArray == null) {
+                    return null;
+                 }
+                 return cachedArray[cacheOffset];
                }
 
                public void set(int cacheOffset, String result) {