[Swift-commit] cog r3636

[swift at ci.uchicago.edu]

------------------------------------------------------------------------
r3636 | hategan | 2013-03-10 01:18:42 -0600 (Sun, 10 Mar 2013) | 1 line

only compare host name when looking up channels
------------------------------------------------------------------------
Index: modules/karajan/src/org/globus/cog/karajan/workflow/service/channels/ChannelManager.java
===================================================================
--- modules/karajan/src/org/globus/cog/karajan/workflow/service/channels/ChannelManager.java	(revision 3635)
+++ modules/karajan/src/org/globus/cog/karajan/workflow/service/channels/ChannelManager.java	(working copy)
@@ -501,14 +501,13 @@
 		public boolean equals(Object obj) {
 			if (obj instanceof HostCredentialPair) {
 				HostCredentialPair other = (HostCredentialPair) obj;
-				return host.equals(other.host)
-						&& ((DN == null && other.DN == null) || ((DN != null) && DN.equals(other.DN)));
+				return host.equals(other.host);
 			}
 			return false;
 		}
 
 		public int hashCode() {
-			return host.hashCode() + ((DN == null) ? 0 : DN.hashCode());
+			return host.hashCode();
 		}
 
 		public String toString() {