summaryrefslogtreecommitdiffstats
path: root/weaver
diff options
context:
space:
mode:
authoraclement <aclement>2006-05-17 11:38:39 +0000
committeraclement <aclement>2006-05-17 11:38:39 +0000
commit5f6a6b12c560f80dd720a943c4c63cf8dc182cc3 (patch)
treef84c6f2c0b932ae8ea3d28c06b12b35fcd98bb7b /weaver
parent7d9a7287ee1aef66ba2edf55ef2fec2bf95b0dc3 (diff)
downloadaspectj-5f6a6b12c560f80dd720a943c4c63cf8dc182cc3.tar.gz
aspectj-5f6a6b12c560f80dd720a943c4c63cf8dc182cc3.zip
test and fix for 141956
Diffstat (limited to 'weaver')
-rw-r--r--weaver/src/org/aspectj/weaver/ResolvedType.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/weaver/src/org/aspectj/weaver/ResolvedType.java b/weaver/src/org/aspectj/weaver/ResolvedType.java
index 84da56906..243b35330 100644
--- a/weaver/src/org/aspectj/weaver/ResolvedType.java
+++ b/weaver/src/org/aspectj/weaver/ResolvedType.java
@@ -285,7 +285,7 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl
boolean shouldSkip = false;
for (int j = 0; j < rtx.interTypeMungers.size(); j++) {
ConcreteTypeMunger munger = (ConcreteTypeMunger) rtx.interTypeMungers.get(j);
- if (munger.getMunger().getKind() == ResolvedTypeMunger.Parent) {
+ if (munger.getMunger()!=null && munger.getMunger().getKind() == ResolvedTypeMunger.Parent) {
shouldSkip = true;
break;
}