S1738: update User equal method

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

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);