Update of /cvsroot/springframework/spring/src/org/springframework/aop/aspectj
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4919/src/org/springframework/aop/aspectj
Modified Files:
AspectJExpressionPointcut.java
Log Message:
polishing
Index: AspectJExpressionPointcut.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/aop/aspectj/AspectJExpressionPointcut.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** AspectJExpressionPointcut.java 30 Sep 2008 14:42:20 -0000 1.37
--- AspectJExpressionPointcut.java 27 Nov 2008 18:04:35 -0000 1.38
***************
*** 93,97 ****
private static final Log logger = LogFactory.getLog(AspectJExpressionPointcut.class);
! private final Map shadowMapCache = new HashMap();
private PointcutParser pointcutParser;
--- 93,97 ----
private static final Log logger = LogFactory.getLog(AspectJExpressionPointcut.class);
! private final Map shadowMatchCache = new HashMap();
private PointcutParser pointcutParser;
***************
*** 365,370 ****
private ShadowMatch getShadowMatch(Method targetMethod, Method originalMethod) {
! synchronized (this.shadowMapCache) {
! ShadowMatch shadowMatch = (ShadowMatch) this.shadowMapCache.get(targetMethod);
if (shadowMatch == null) {
try {
--- 365,370 ----
private ShadowMatch getShadowMatch(Method targetMethod, Method originalMethod) {
! synchronized (this.shadowMatchCache) {
! ShadowMatch shadowMatch = (ShadowMatch) this.shadowMatchCache.get(targetMethod);
if (shadowMatch == null) {
try {
***************
*** 379,383 ****
shadowMatch = this.pointcutExpression.matchesMethodExecution(originalMethod);
}
! this.shadowMapCache.put(targetMethod, shadowMatch);
}
return shadowMatch;
--- 379,383 ----
shadowMatch = this.pointcutExpression.matchesMethodExecution(originalMethod);
}
! this.shadowMatchCache.put(targetMethod, shadowMatch);
}
return shadowMatch;
|