aboutsummaryrefslogtreecommitdiffstats
path: root/weaver
diff options
context:
space:
mode:
authoraclement <aclement>2006-11-29 15:46:51 +0000
committeraclement <aclement>2006-11-29 15:46:51 +0000
commit09e2b1bc62beb82dbaf746b996ebc8d7049380bc (patch)
treed0d98ec6819404c935eb2710f35d10d108a315ac /weaver
parent9a5ffae290474a04abf2249abcef1f23b9487492 (diff)
downloadaspectj-09e2b1bc62beb82dbaf746b996ebc8d7049380bc.tar.gz
aspectj-09e2b1bc62beb82dbaf746b996ebc8d7049380bc.zip
test and fix for 165631: Dont allow multiple parameterizations in a hierarchy
Diffstat (limited to 'weaver')
-rw-r--r--weaver/src/org/aspectj/weaver/patterns/DeclareParents.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/weaver/src/org/aspectj/weaver/patterns/DeclareParents.java b/weaver/src/org/aspectj/weaver/patterns/DeclareParents.java
index 414e1d8ba..3d97bcad7 100644
--- a/weaver/src/org/aspectj/weaver/patterns/DeclareParents.java
+++ b/weaver/src/org/aspectj/weaver/patterns/DeclareParents.java
@@ -326,7 +326,9 @@ public class DeclareParents extends Declare {
return false;
}
}
- return verifyNoInheritedAlternateParameterization(supertype,newParent,world);
+ if (!verifyNoInheritedAlternateParameterization(supertype,newParent,world)) {
+ return false;
+ }
}
return true;
}