From 735e50eaeafcf33a14cb6f6e0b50aa137e4903d8 Mon Sep 17 00:00:00 2001
From: Jeff Burke <Jeff.Burke@nrc-cnrc.gc.ca>
Date: Fri, 13 Mar 2015 09:44:17 -0700
Subject: [PATCH] S1738: update User equal method
---
.../src/ca/nrc/cadc/ac/User.java | 15 ++++++++++++++-
.../src/ca/nrc/cadc/ac/GroupReaderWriterTest.java | 2 --
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/User.java b/projects/cadcAccessControl/src/ca/nrc/cadc/ac/User.java
index 308552ef..b7ad0bcc 100644
--- a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/User.java
+++ b/projects/cadcAccessControl/src/ca/nrc/cadc/ac/User.java
@@ -74,6 +74,8 @@ import java.util.Set;
import ca.nrc.cadc.auth.AuthenticationUtil;
+import javax.security.auth.x500.X500Principal;
+
public class User<T extends Principal>
{
@@ -133,7 +135,18 @@ public class User<T extends Principal>
return false;
}
User other = (User) obj;
- return AuthenticationUtil.equals(userID, other.userID);
+ if (userID instanceof X500Principal)
+ {
+ return AuthenticationUtil.equals(userID, other.userID);
+ }
+ else
+ {
+ if (!userID.equals(other.userID))
+ {
+ return false;
+ }
+ return true;
+ }
}
@Override
diff --git a/projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/GroupReaderWriterTest.java b/projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/GroupReaderWriterTest.java
index 7eca5993..c54f6ee5 100644
--- a/projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/GroupReaderWriterTest.java
+++ b/projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/GroupReaderWriterTest.java
@@ -174,8 +174,6 @@ public class GroupReaderWriterTest
StringBuilder xml = new StringBuilder();
GroupWriter.write(expected, xml);
assertFalse(xml.toString().isEmpty());
-
- System.out.println(xml.toString());
Group actual = GroupReader.read(xml.toString());
assertNotNull(actual);
--
GitLab