summaryrefslogtreecommitdiffstats
path: root/loadtime
diff options
context:
space:
mode:
authorAndy Clement <aclement@gopivotal.com>2014-04-15 16:51:02 -0700
committerAndy Clement <aclement@gopivotal.com>2014-04-15 16:51:02 -0700
commitc641ffdbb6c04956a7b1a6d6c89c9c6c67be0761 (patch)
tree3391f978edd551335757a67d6c03c5890c3312c5 /loadtime
parent5aaca752afa424015f81379dcd0a69e737340e56 (diff)
downloadaspectj-c641ffdbb6c04956a7b1a6d6c89c9c6c67be0761.tar.gz
aspectj-c641ffdbb6c04956a7b1a6d6c89c9c6c67be0761.zip
Fix 432178: percflow concreteaspectcodegen problem
Diffstat (limited to 'loadtime')
-rw-r--r--loadtime/src/org/aspectj/weaver/loadtime/ConcreteAspectCodeGen.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/loadtime/src/org/aspectj/weaver/loadtime/ConcreteAspectCodeGen.java b/loadtime/src/org/aspectj/weaver/loadtime/ConcreteAspectCodeGen.java
index 620b84874..c0fd9d342 100644
--- a/loadtime/src/org/aspectj/weaver/loadtime/ConcreteAspectCodeGen.java
+++ b/loadtime/src/org/aspectj/weaver/loadtime/ConcreteAspectCodeGen.java
@@ -366,11 +366,11 @@ public class ConcreteAspectCodeGen {
if (bytes != null) {
return bytes;
}
+ PerClause.Kind perclauseKind = PerClause.SINGLETON;
PerClause parentPerClause = (parent != null ? parent.getPerClause() : null);
- if (parentPerClause == null) {
- parentPerClause = new PerSingleton();
+ if (parentPerClause != null) {
+ perclauseKind = parentPerClause.getKind();
}
- PerClause.Kind perclauseKind = PerClause.SINGLETON;
String perclauseString = null;
if (concreteAspect.perclause != null) {