[jboss-svn-commits] JBoss Common SVN: r2053 - common-old/branches/Branch_1_0/src/main/org/jboss/net/sockets

[jboss-svn-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2006-09-24 08:43:31 -0400 (Sun, 24 Sep 2006)
New Revision: 2053

Modified:
   common-old/branches/Branch_1_0/src/main/org/jboss/net/sockets/DefaultSocketFactory.java
Log:
JBCOMMON-10, include the bindAddress in the equals/hashCode calcs

Modified: common-old/branches/Branch_1_0/src/main/org/jboss/net/sockets/DefaultSocketFactory.java
===================================================================
--- common-old/branches/Branch_1_0/src/main/org/jboss/net/sockets/DefaultSocketFactory.java	2006-09-21 23:13:46 UTC (rev 2052)
+++ common-old/branches/Branch_1_0/src/main/org/jboss/net/sockets/DefaultSocketFactory.java	2006-09-24 12:43:31 UTC (rev 2053)
@@ -121,12 +121,25 @@
         return activeSocket;
     }
 
-    public boolean equals(Object obj)
-    {
-        return obj instanceof DefaultSocketFactory;
-    }
-    public int hashCode()
-    {
-        return getClass().getName().hashCode();
-    }
+   public boolean equals(Object obj)
+   {
+      boolean equals = obj instanceof DefaultSocketFactory;
+      if( equals && bindAddress != null )
+      {
+         DefaultSocketFactory dsf = (DefaultSocketFactory) obj;
+         InetAddress dsfa = dsf.bindAddress;
+         if( dsfa != null )
+            equals = bindAddress.equals(dsfa);
+         else
+            equals = false;
+      }
+      return equals;
+   }
+   public int hashCode()
+   {
+      int hashCode = getClass().getName().hashCode();
+      if( bindAddress != null )
+         hashCode += bindAddress.toString().hashCode();
+      return hashCode;
+   }
 }