summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraclement <aclement>2010-09-01 00:29:30 +0000
committeraclement <aclement>2010-09-01 00:29:30 +0000
commit88fab6ad42f17bce86217d0b0fd6525dd5953bc4 (patch)
treee6a2eee18a87bed8e5e54fd808cb7dc3d9abd6be
parent7bcd31c7d5866f396446e1d9b997f105ebc4d16f (diff)
downloadaspectj-88fab6ad42f17bce86217d0b0fd6525dd5953bc4.tar.gz
aspectj-88fab6ad42f17bce86217d0b0fd6525dd5953bc4.zip
324135: npe fix
-rw-r--r--org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjState.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjState.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjState.java
index e143c8aa0..83fca1b00 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjState.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjState.java
@@ -1762,6 +1762,9 @@ public class AjState implements CompilerConfigurationChangeFlags, TypeDelegateRe
}
if (binaryNestedTypes != null) {
int bnLength = binaryNestedTypes.length;
+ if (existingBinaryNestedTypes.length != bnLength) {
+ return true;
+ }
for (int m = 0; m < bnLength; m++) {
IBinaryNestedType bnt = binaryNestedTypes[m];
IBinaryNestedType existingBnt = existingBinaryNestedTypes[m];
@@ -2151,7 +2154,7 @@ public class AjState implements CompilerConfigurationChangeFlags, TypeDelegateRe
ClassParser parser = new ClassParser(f.toString());
return world.buildBcelDelegate(referenceType, parser.parse(), true, false);
} catch (IOException e) {
- System.err.println("Failed to recover "+referenceType);
+ System.err.println("Failed to recover " + referenceType);
e.printStackTrace();
}
return null;