From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 9 Apr 2010 11:16:40 +0000 (+0000)
Subject: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49075
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=64123f4f3e5fb9f520004b603547806efef1430d;p=tomcat7.0

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49075
NPE protection if roles is null and roles needs to be modifiable

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@932357 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/realm/JNDIRealm.java b/java/org/apache/catalina/realm/JNDIRealm.java
index 55ebf6bfb..bf5a21e27 100644
--- a/java/org/apache/catalina/realm/JNDIRealm.java
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
@@ -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() {