Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Issue: SPR-15019
(cherry picked from commit 97ea22c)
This commit is contained in:
Juergen Hoeller
2016-12-20 12:17:51 +01:00
parent a5ce965d22
commit 935671ae32
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2015 the original author or authors. * Copyright 2002-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -28,7 +28,6 @@ import java.util.concurrent.ConcurrentHashMap;
import org.aopalliance.intercept.MethodInvocation; import org.aopalliance.intercept.MethodInvocation;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.aspectj.weaver.BCException;
import org.aspectj.weaver.patterns.NamePattern; import org.aspectj.weaver.patterns.NamePattern;
import org.aspectj.weaver.reflect.ReflectionWorld.ReflectionWorldException; import org.aspectj.weaver.reflect.ReflectionWorld.ReflectionWorldException;
import org.aspectj.weaver.reflect.ShadowMatchImpl; import org.aspectj.weaver.reflect.ShadowMatchImpl;
@@ -258,11 +257,7 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
} }
} }
} }
catch (BCException ex) { catch (Throwable 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); logger.debug("PointcutExpression matching rejected target class", ex);
} }
return false; return false;
@@ -330,7 +325,6 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
} }
catch (IllegalStateException ex) { catch (IllegalStateException ex) {
// No current invocation... // No current invocation...
// TODO: Should we really proceed here?
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug("Could not access current invocation - matching with limited context: " + ex); logger.debug("Could not access current invocation - matching with limited context: " + ex);
} }
@@ -453,8 +447,8 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
} }
} }
} }
catch (IllegalStateException ex) { catch (Throwable ex) {
// AspectJ 1.8.10: encountered invalid signature // Possibly AspectJ 1.8.10 encountering an invalid signature
logger.debug("PointcutExpression matching rejected target method", ex); logger.debug("PointcutExpression matching rejected target method", ex);
fallbackExpression = null; fallbackExpression = null;
} }