Browse Source

Defensively catch IllegalStateException from match attempts (for compatibility with AspectJ 1.8.10)

Issue: SPR-15019
(cherry picked from commit 3370f41)
pull/1290/head
Juergen Hoeller 9 years ago
parent
commit
f0c3d50408
  1. 11
      spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java

11
spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java

@ -261,6 +261,10 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut @@ -261,6 +261,10 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
catch (BCException ex) {
logger.debug("PointcutExpression matching rejected target class", ex);
}
catch (IllegalStateException ex) {
// AspectJ 1.8.10: encountered invalid signature
logger.debug("PointcutExpression matching rejected target class", ex);
}
return false;
}
@ -412,6 +416,7 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut @@ -412,6 +416,7 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
Method methodToMatch = targetMethod;
shadowMatch = this.shadowMatchCache.get(targetMethod);
if (shadowMatch == null) {
try {
try {
shadowMatch = this.pointcutExpression.matchesMethodExecution(methodToMatch);
}
@ -447,6 +452,12 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut @@ -447,6 +452,12 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
}
}
}
}
catch (IllegalStateException ex) {
// AspectJ 1.8.10: encountered invalid signature
logger.debug("PointcutExpression matching rejected target method", ex);
fallbackExpression = null;
}
if (shadowMatch == null) {
shadowMatch = new ShadowMatchImpl(org.aspectj.util.FuzzyBoolean.NO, null, null, null);
}

Loading…
Cancel
Save