Browse Source

Revert "Work Around SPR-15651"

This reverts commit 6c286696b4.
pull/4402/head
Rob Winch 9 years ago
parent
commit
fb85ad6bd7
  1. 3
      core/src/main/java/org/springframework/security/access/method/AbstractMethodSecurityMetadataSource.java

3
core/src/main/java/org/springframework/security/access/method/AbstractMethodSecurityMetadataSource.java

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

Loading…
Cancel
Save