s1890 - A user is consistent with another if they are equals

cadcAccessControl/src/ca/nrc/cadc/ac/User.java

@@ -68,8 +68,6 @@
  */
 package ca.nrc.cadc.ac;
 
-import ca.nrc.cadc.auth.HttpPrincipal;
-
 import java.security.Principal;
 import java.util.Comparator;
 import java.util.Date;
@@ -77,6 +75,8 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.TreeSet;
 
+import ca.nrc.cadc.auth.HttpPrincipal;
+
 public class User
 {
     private InternalID id;
@@ -155,23 +155,22 @@ public class User
             return false;
         }
 
+        if (this.equals(other))
+        {
+            return true;
+        }
+
         for (Principal identity: getIdentities())
         {
-            boolean found = false;
             for (Principal op: other.getIdentities())
             {
                 if (op.equals(identity))
                 {
-                    found = true;
-                    break;
+                    return true;
                 }
             }
-            if (!found)
-            {
-                return false;
         }
-        }
-        return true;
+        return false;
     }
 
     /* (non-Javadoc)