From d90c2ce8680fab67c64683ae3fee52161c9afd25 Mon Sep 17 00:00:00 2001
From: Brian Major <major.brian@gmail.com>
Date: Thu, 17 Mar 2016 15:38:24 -0700
Subject: [PATCH] s1890 - A user is consistent with another if they are equals
---
.../src/ca/nrc/cadc/ac/User.java | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/cadcAccessControl/src/ca/nrc/cadc/ac/User.java b/cadcAccessControl/src/ca/nrc/cadc/ac/User.java
index 6665cbe9..1a34123f 100644
--- a/cadcAccessControl/src/ca/nrc/cadc/ac/User.java
+++ b/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)
--
GitLab