From 8c0dce3dce700e66ec5fa4de901a2cf3d0a465a1 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 3 Mar 2010 14:38:01 +0000
Subject: [PATCH] Implement review feedback

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@918489 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/realm/JNDIRealm.java | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/catalina/realm/JNDIRealm.java b/java/org/apache/catalina/realm/JNDIRealm.java
index be79acb12..a9baea210 100644
--- a/java/org/apache/catalina/realm/JNDIRealm.java
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
@@ -1617,7 +1617,7 @@ public class JNDIRealm extends RealmBase {
             containerLog.trace("  getRoles(" + dn + ")");
 
         // Start with roles retrieved from the user entry
-        ArrayList<String> list = user.roles;
+        List<String> list = user.roles;
         if (list == null) {
             list = new ArrayList<String>();
         }
@@ -2218,21 +2218,21 @@ public class JNDIRealm extends RealmBase {
      // ------------------------------------------------------ Private Classes
     
      /**
-      * A private class representing a User
+      * A protected class representing a User
       */
      protected static class User {
          
-         private String username = null;
-         private String dn = null;
-         private String password = null;
-         private ArrayList<String> roles = null;
+         final private String username;
+         final private String dn;
+         final private String password;
+         final private List<String> roles;
 
-         User(String username, String dn, String password,
-                 ArrayList<String> roles) {
+         protected User(String username, String dn, String password,
+                 List<String> roles) {
              this.username = username;
              this.dn = dn;
              this.password = password;
-             this.roles = roles;
+             this.roles = Collections.unmodifiableList(roles);
          }
     
          public String getUserName() {
@@ -2248,7 +2248,7 @@ public class JNDIRealm extends RealmBase {
          }
          
          public List<String> getRoles() {
-             return Collections.unmodifiableList(roles);
+             return roles;
          }
      }
 }
-- 
2.11.0