From f257c482f3cd7f31a010928cc57392757f1fe194 Mon Sep 17 00:00:00 2001
From: Brian Major <major.brian@gmail.com>
Date: Mon, 21 Mar 2016 10:23:12 -0700
Subject: [PATCH] s1890 - reverted isConsistent() changes
---
cadcAccessControl/src/ca/nrc/cadc/ac/User.java | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/cadcAccessControl/src/ca/nrc/cadc/ac/User.java b/cadcAccessControl/src/ca/nrc/cadc/ac/User.java
index 1a34123f..19a1b2cd 100644
--- a/cadcAccessControl/src/ca/nrc/cadc/ac/User.java
+++ b/cadcAccessControl/src/ca/nrc/cadc/ac/User.java
@@ -155,22 +155,23 @@ 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))
{
- return true;
+ found = true;
+ break;
}
}
+ if (!found)
+ {
+ return false;
+ }
}
- return false;
+ return true;
}
/* (non-Javadoc)
--
GitLab