Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SEC-688: java.lang.NullPointerException in AbstractAuthenticationToken.equals()

Browse Source 
http://jira.springframework.org/browse/SEC-688
This commit is contained in:
Luke Taylor
2008-02-28 11:44:15 +00:00
parent e6e1f2586f
commit 709f78e481
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/main/java/org/springframework/security/providers/AbstractAuthenticationToken.java
View File

@@ -110,9 +110,16 @@ public abstract class AbstractAuthenticationToken implements Authentication {
if ((this.getCredentials() != null) && !this.getCredentials().equals(test.getCredentials())) {
return false;
}
if (this.getPrincipal() == null && test.getPrincipal() != null) {
return false;
}
return (this.getPrincipal().equals(test.getPrincipal())
&& (this.isAuthenticated() == test.isAuthenticated()));
if (this.getPrincipal() != null && !this.getPrincipal().equals(test.getPrincipal())) {
return false;
}
return this.isAuthenticated() == test.isAuthenticated();
}
return false;