svn commit: r941176 - /incubator/river/jtsk/trunk/src/org/apache/river/security/policy/util/PolicyEntry.java

[pe...@apache.org]

Author: peter_firmstone
Date: Wed May  5 07:16:33 2010
New Revision: 941176

URL: http://svn.apache.org/viewvc?rev=941176&view=rev
Log:
Equals contract not quite right, due to unmodifiable collection.

Modified:
    incubator/river/jtsk/trunk/src/org/apache/river/security/policy/util/PolicyEntry.java

Modified: incubator/river/jtsk/trunk/src/org/apache/river/security/policy/util/PolicyEntry.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/org/apache/river/security/policy/util/PolicyEntry.java?rev=941176&r1=941175&r2=941176&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/org/apache/river/security/policy/util/PolicyEntry.java (original)
+++ incubator/river/jtsk/trunk/src/org/apache/river/security/policy/util/PolicyEntry.java Wed May  5 07:16:33 2010
@@ -75,9 +75,8 @@ public final class PolicyEntry {
         if (permissions == null || permissions.isEmpty()) {
             this.permissions = Collections.emptySet(); // Java 1.5
         }else{
-            Set<Permission> perm = new HashSet<Permission>(permissions.size());
-            perm.addAll(permissions);
-            this.permissions = Collections.unmodifiableCollection(perm);
+            this.permissions = new HashSet<Permission>(permissions.size());
+            this.permissions.addAll(permissions);
         }
         /* Effectively immutable, this will make any hash this is contained in perform.
          * May need to consider Serializable for this class yet, we'll see.
@@ -136,7 +135,7 @@ public final class PolicyEntry {
      */
     public Collection<Permission> getPermissions() {
 //        if (permissions.isEmpty()) return null; // not sure if this is good needs further investigation
-        return permissions;
+        return Collections.unmodifiableCollection(permissions);
     }
 
     /**