Author: markt
Date: Tue Mar 9 12:14:23 2010
New Revision: 920824
URL: http://svn.apache.org/viewvc?rev=920824&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48729
Return roles defined by both userRoleName and roleName mechanisms
Patch provided by 'eric'
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=920824&r1=920823&r2=920824&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Tue Mar 9
12:14:23 2010
@@ -1725,7 +1725,8 @@ public class JNDIRealm extends RealmBase
}
}
- return new ArrayList<String>(groupMap.values());
+ list.addAll(groupMap.values());
+ return list;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
