From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 9 Mar 2010 12:14:23 +0000 (+0000)
Subject: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48729
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=bd45d703a324575dc30dac4daab88a0ac023718c;p=tomcat7.0

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48729
Return roles defined by both userRoleName and roleName mechanisms
Patch provided by 'eric'

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

diff --git a/java/org/apache/catalina/realm/JNDIRealm.java b/java/org/apache/catalina/realm/JNDIRealm.java
index 26eabec78..55ebf6bfb 100644
--- a/java/org/apache/catalina/realm/JNDIRealm.java
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
@@ -1725,7 +1725,8 @@ public class JNDIRealm extends RealmBase {
             }
         }
 
-        return new ArrayList<String>(groupMap.values());
+        list.addAll(groupMap.values());
+        return list;
     }