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

SEC-271: Replaced Java 5 specific code with pre Java 5

This commit is contained in:
Vishal Puri 2007-05-17 03:04:07 +00:00
parent e67bff61a0
commit 84a3c87ea4
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/main/java/org/acegisecurity/config/LogoutHandlerOrderResolver.java
View File

@ -68,20 +68,22 @@ public class LogoutHandlerOrderResolver implements BeanFactoryPostProcessor {
RootBeanDefinition definition = (RootBeanDefinition) beanFactory.getBeanDefinition(names[i]);
if (Ordered.class.isAssignableFrom(definition.getBeanClass())) {
definition.getPropertyValues().addPropertyValue("order", getOrder(definition.getBeanClass()));
list.add(definition);
definition.getPropertyValues().addPropertyValue("order", new Integer(getOrder(definition.getBeanClass())));
} else {
definition.getPropertyValues().addPropertyValue("order", new Integer(Integer.MAX_VALUE));
}
list.add(definition);
}
Collections.sort(list, new OrderComparator());
return list;
}
private int getOrder(Class clazz) {
if (clazz.getName().equals(TokenBasedRememberMeServices.class.getName())) {
return 0;
return 100;
}
if (clazz.getName().equals(SecurityContextLogoutHandler.class.getName())) {
return 1;
return 200;
}
return Integer.MAX_VALUE;
}

4
core/src/main/java/org/acegisecurity/config/PrincipalRepositoryBeanDefinitionParser.java
View File

@ -197,10 +197,10 @@ public class PrincipalRepositoryBeanDefinitionParser extends AbstractBeanDefinit
String propertyValue = element.getAttribute(ENABLED);
if (StringUtils.hasText(propertyValue)) {
if (propertyValue.equals("true")) {
userAttribute.setEnabled(Boolean.TRUE);
userAttribute.setEnabled(true);
}
else {
userAttribute.setEnabled(Boolean.FALSE);
userAttribute.setEnabled(false);
}
}
}