From 64123f4f3e5fb9f520004b603547806efef1430d Mon Sep 17 00:00:00 2001 From: markt Date: Fri, 9 Apr 2010 11:16:40 +0000 Subject: [PATCH] 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 --- java/org/apache/catalina/realm/JNDIRealm.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 roles; + final private List roles = new ArrayList(); public User(String username, String dn, String password, List 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() { -- 2.11.0