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

SEC-896: Changed result.toString() to String.valueOf(result) in tag class to prevent NPE when value of property is null

This commit is contained in:
Luke Taylor 2008-06-30 21:02:23 +00:00
parent dd5edbcce9
commit c372c2df87
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
taglibs/src/main/java/org/springframework/security/taglibs/authz/AuthenticationTag.java
View File

@ -33,7 +33,7 @@ import javax.servlet.jsp.tagext.TagSupport;
/** /**
* An {@link javax.servlet.jsp.tagext.Tag} implementation that allows convenient access to the current * An {@link javax.servlet.jsp.tagext.Tag} implementation that allows convenient access to the current
* <code>Authentication</code> object. The <tt>operation</tt> attribute * <code>Authentication</code> object.
* <p> * <p>
* Whilst JSPs can access the <code>SecurityContext</code> directly, this tag avoids handling <code>null</code> conditions. * Whilst JSPs can access the <code>SecurityContext</code> directly, this tag avoids handling <code>null</code> conditions.
* *
@ -93,13 +93,13 @@ public class AuthenticationTag extends TagSupport {
if (auth.getPrincipal() == null) { if (auth.getPrincipal() == null) {
return Tag.EVAL_PAGE; return Tag.EVAL_PAGE;
} else { }
try {
BeanWrapperImpl wrapper = new BeanWrapperImpl(auth); try {
result = wrapper.getPropertyValue(property); BeanWrapperImpl wrapper = new BeanWrapperImpl(auth);
} catch (BeansException e) { result = wrapper.getPropertyValue(property);
throw new JspException(e); } catch (BeansException e) {
} throw new JspException(e);
} }
} }
@ -120,7 +120,7 @@ public class AuthenticationTag extends TagSupport {
} }
} }
} else { } else {
writeMessage(result.toString()); writeMessage(String.valueOf(result));
} }
return EVAL_PAGE; return EVAL_PAGE;
} }