Author: markt
Date: Fri Apr 9 11:16:40 2010
New Revision: 932357
URL: http://svn.apache.org/viewvc?rev=932357&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49075
NPE protection if roles is null and roles needs to be modifiable
Modified:
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=932357&r1=932356&r2=932357&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Fri Apr 9
11:16:40 2010
@@ -2229,14 +2229,16 @@ public class JNDIRealm extends RealmBase
final private String username;
final private String dn;
final private String password;
- final private List<String> roles;
+ final private List<String> roles = new ArrayList<String>();
public User(String username, String dn, String password,
List<String> roles) {
this.username = username;
this.dn = dn;
this.password = password;
- this.roles = Collections.unmodifiableList(roles);
+ if (roles != null) {
+ this.roles.addAll(roles);
+ }
}
public String getUserName() {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
