You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by dl...@apache.org on 2001/07/30 21:03:45 UTC
cvs commit: jakarta-turbine/src/java/org/apache/turbine/util/security RoleSet.java
dlr 01/07/30 12:03:45
Modified: src/java/org/apache/turbine/util/security Tag: T_2_1_BRANCH
RoleSet.java
Log:
Backported fixes from HEAD.
Revision Changes Path
No revision
No revision
1.4.10.2 +5 -3 jakarta-turbine/src/java/org/apache/turbine/util/security/Attic/RoleSet.java
Index: RoleSet.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/util/security/Attic/RoleSet.java,v
retrieving revision 1.4.10.1
retrieving revision 1.4.10.2
diff -u -u -r1.4.10.1 -r1.4.10.2
--- RoleSet.java 2001/05/07 03:06:58 1.4.10.1
+++ RoleSet.java 2001/07/30 19:03:44 1.4.10.2
@@ -73,11 +73,13 @@
*
* @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
* @author <a href="mailto:bmclaugh@algx.net">Brett McLaughlin</a>
- * @version $Id: RoleSet.java,v 1.4.10.1 2001/05/07 03:06:58 jvanzyl Exp $
+ * @version $Id: RoleSet.java,v 1.4.10.2 2001/07/30 19:03:44 dlr Exp $
*/
public class RoleSet implements Serializable
{
- /** Set to hold the Role Set */
+ /**
+ * Role storage.
+ */
private TreeSet set;
/**
@@ -137,7 +139,7 @@
*/
public boolean add(RoleSet roleSet)
{
- return set.add((Collection)roleSet.set);
+ return set.addAll(roleSet.set);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org