|
@@ -22,7 +22,6 @@ 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.springframework.aop.framework.AopProxyUtils;
|
|
import org.springframework.aop.framework.AopProxyUtils;
|
|
-import org.springframework.aop.target.EmptyTargetSource;
|
|
|
|
import org.springframework.security.access.ConfigAttribute;
|
|
import org.springframework.security.access.ConfigAttribute;
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -46,7 +45,7 @@ public abstract class AbstractMethodSecurityMetadataSource implements
|
|
Object target = mi.getThis();
|
|
Object target = mi.getThis();
|
|
Class<?> targetClass = null;
|
|
Class<?> targetClass = null;
|
|
|
|
|
|
- if (target != null && target != EmptyTargetSource.INSTANCE.getTarget()) {
|
|
|
|
|
|
+ if (target != null) {
|
|
targetClass = target instanceof Class<?> ? (Class<?>) target
|
|
targetClass = target instanceof Class<?> ? (Class<?>) target
|
|
: AopProxyUtils.ultimateTargetClass(target);
|
|
: AopProxyUtils.ultimateTargetClass(target);
|
|
}
|
|
}
|