Some of the fix for Bugzilla Bug 57432

   NPE when creating declare messages 
[Allow for null targeters - for example when the class file has no debug info in it]

1 files changed, 8 insertions, 6 deletions

diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java b/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java
index fc5c0c1a8..ca41e2aec 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelShadow.java
@@ -438,13 +438,15 @@ public class BcelShadow extends Shadow {
 			int slot = ((StoreInstruction)startOfHandler.getInstruction()).getIndex();
 			//System.out.println("got store: " + startOfHandler.getInstruction() + ", " + index);
 			InstructionTargeter[] targeters = startOfHandler.getNext().getTargeters();
-			for (int i=targeters.length-1; i >= 0; i--) {
-				if (targeters[i] instanceof LocalVariableTag) {
-					LocalVariableTag t = (LocalVariableTag)targeters[i];
-					if (t.getSlot() == slot) {
-						return t.getName();
+			if (targeters!=null) {
+				for (int i=targeters.length-1; i >= 0; i--) {
+					if (targeters[i] instanceof LocalVariableTag) {
+						LocalVariableTag t = (LocalVariableTag)targeters[i];
+						if (t.getSlot() == slot) {
+							return t.getName();
+						}
+						//System.out.println("tag: " + targeters[i]);
 					}
-					//System.out.println("tag: " + targeters[i]);
 				}
  			}
 		}