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

3 files changed, 5 insertions, 1 deletions

diff --git a/lib/aspectj/lib/aspectjrt.jar b/lib/aspectj/lib/aspectjrt.jar
index 77308ed31..01aac1180 100644
--- a/lib/aspectj/lib/aspectjrt.jar
+++ b/lib/aspectj/lib/aspectjrt.jar
diff --git a/lib/test/aspectjrt.jar b/lib/test/aspectjrt.jar
index 77308ed31..01aac1180 100644
--- a/lib/test/aspectjrt.jar
+++ b/lib/test/aspectjrt.jar
diff --git a/runtime/src/org/aspectj/runtime/reflect/SignatureImpl.java b/runtime/src/org/aspectj/runtime/reflect/SignatureImpl.java
index cb5b269ef..5dd024855 100644
--- 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) {