Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-07-06 18:52:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove SPR-11251 workaround from WebSecurityConfiguration

Browse Source 
Fixes gh-3348
This commit is contained in:
Rob Winch 2016-03-09 16:48:24 -06:00
parent be36ddb614
commit 5d6e8bc3c8
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfiguration.java
View File

@ -206,23 +206,6 @@ public class WebSecurityConfiguration implements ImportAware, BeanClassLoaderAwa
.getAnnotationAttributes(EnableWebSecurity.class.getName()); .getAnnotationAttributes(EnableWebSecurity.class.getName());
AnnotationAttributes enableWebSecurityAttrs = AnnotationAttributes AnnotationAttributes enableWebSecurityAttrs = AnnotationAttributes
.fromMap(enableWebSecurityAttrMap); .fromMap(enableWebSecurityAttrMap);
if (enableWebSecurityAttrs == null) {
// search parent classes
Class<?> currentClass = ClassUtils.resolveClassName(
importMetadata.getClassName(), beanClassLoader);
for (Class<?> classToInspect = currentClass; classToInspect != null; classToInspect = classToInspect
.getSuperclass()) {
EnableWebSecurity enableWebSecurityAnnotation = AnnotationUtils
.findAnnotation(classToInspect, EnableWebSecurity.class);
if (enableWebSecurityAnnotation == null) {
continue;
}
enableWebSecurityAttrMap = AnnotationUtils
.getAnnotationAttributes(enableWebSecurityAnnotation);
enableWebSecurityAttrs = AnnotationAttributes
.fromMap(enableWebSecurityAttrMap);
}
}
debugEnabled = enableWebSecurityAttrs.getBoolean("debug"); debugEnabled = enableWebSecurityAttrs.getBoolean("debug");
if (webSecurity != null) { if (webSecurity != null) {
webSecurity.debug(debugEnabled); webSecurity.debug(debugEnabled);