Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Work Around SPR-15651" 

This reverts commit 6c286696b4.
This commit is contained in:
Rob Winch 2017-06-15 13:53:52 -05:00
parent dcef3d6ebb
commit fb85ad6bd7
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);
} }