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

use Method in fixedInterceptorMap instead of String returned from Method::toString

Browse Source
This commit is contained in:
stsypanov
2019-01-15 11:53:52 +02:00
committed by Juergen Hoeller
parent e7dc439f90
commit e44d3dabc4
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java
View File

@@ -112,7 +112,7 @@ class CglibAopProxy implements AopProxy, Serializable {
/** Dispatcher used for methods on Advised. */ /** Dispatcher used for methods on Advised. */
private final transient AdvisedDispatcher advisedDispatcher; private final transient AdvisedDispatcher advisedDispatcher;
private transient Map<String, Integer> fixedInterceptorMap = Collections.emptyMap(); private transient Map<Method, Integer> fixedInterceptorMap = Collections.emptyMap();
private transient int fixedInterceptorOffset; private transient int fixedInterceptorOffset;
@@ -327,10 +327,11 @@ class CglibAopProxy implements AopProxy, Serializable {
// TODO: small memory optimization here (can skip creation for methods with no advice) // TODO: small memory optimization here (can skip creation for methods with no advice)
for (int x = 0; x < methods.length; x++) { for (int x = 0; x < methods.length; x++) {
List<Object> chain = this.advised.getInterceptorsAndDynamicInterceptionAdvice(methods[x], rootClass); Method method = methods[x];
List<Object> chain = this.advised.getInterceptorsAndDynamicInterceptionAdvice(method, rootClass);
fixedCallbacks[x] = new FixedChainStaticTargetInterceptor( fixedCallbacks[x] = new FixedChainStaticTargetInterceptor(
chain, this.advised.getTargetSource().getTarget(), this.advised.getTargetClass()); chain, this.advised.getTargetSource().getTarget(), this.advised.getTargetClass());
this.fixedInterceptorMap.put(methods[x].toString(), x); this.fixedInterceptorMap.put(method, x);
} }
// Now copy both the callbacks from mainCallbacks // Now copy both the callbacks from mainCallbacks
@@ -762,12 +763,12 @@ class CglibAopProxy implements AopProxy, Serializable {
private final AdvisedSupport advised; private final AdvisedSupport advised;
private final Map<String, Integer> fixedInterceptorMap; private final Map<Method, Integer> fixedInterceptorMap;
private final int fixedInterceptorOffset; private final int fixedInterceptorOffset;
public ProxyCallbackFilter( public ProxyCallbackFilter(
AdvisedSupport advised, Map<String, Integer> fixedInterceptorMap, int fixedInterceptorOffset) { AdvisedSupport advised, Map<Method, Integer> fixedInterceptorMap, int fixedInterceptorOffset) {
this.advised = advised; this.advised = advised;
this.fixedInterceptorMap = fixedInterceptorMap; this.fixedInterceptorMap = fixedInterceptorMap;
@@ -852,7 +853,7 @@ class CglibAopProxy implements AopProxy, Serializable {
} }
return AOP_PROXY; return AOP_PROXY;
} }
String key = method.toString(); Method key = method;
// Check to see if we have fixed interceptor to serve this method. // Check to see if we have fixed interceptor to serve this method.
// Else use the AOP_PROXY. // Else use the AOP_PROXY.
if (isStatic && isFrozen && this.fixedInterceptorMap.containsKey(key)) { if (isStatic && isFrozen && this.fixedInterceptorMap.containsKey(key)) {

1
spring-aop/src/main/java/org/springframework/aop/framework/ObjenesisCglibAopProxy.java
View File

@@ -53,7 +53,6 @@ class ObjenesisCglibAopProxy extends CglibAopProxy {
@Override @Override
@SuppressWarnings("unchecked")
protected Object createProxyClassAndInstance(Enhancer enhancer, Callback[] callbacks) { protected Object createProxyClassAndInstance(Enhancer enhancer, Callback[] callbacks) {
Class<?> proxyClass = enhancer.createClass(); Class<?> proxyClass = enhancer.createClass();
Object proxyInstance = null; Object proxyInstance = null;