[jboss-cvs] JBossAS SVN: r57117 - branches/JBoss_4_0_3_SP1_JBAS-3689/common/src/main/org/jboss/net/sockets

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

Author: scott.stark at jboss.org
Date: 2006-09-24 10:10:53 -0400 (Sun, 24 Sep 2006)
New Revision: 57117

Modified:
   branches/JBoss_4_0_3_SP1_JBAS-3689/common/src/main/org/jboss/net/sockets/DefaultSocketFactory.java
Log:
Include the bindAddress in the equals/hashCode calcs.

Modified: branches/JBoss_4_0_3_SP1_JBAS-3689/common/src/main/org/jboss/net/sockets/DefaultSocketFactory.java
===================================================================
--- branches/JBoss_4_0_3_SP1_JBAS-3689/common/src/main/org/jboss/net/sockets/DefaultSocketFactory.java	2006-09-24 10:54:21 UTC (rev 57116)
+++ branches/JBoss_4_0_3_SP1_JBAS-3689/common/src/main/org/jboss/net/sockets/DefaultSocketFactory.java	2006-09-24 14:10:53 UTC (rev 57117)
@@ -108,10 +108,23 @@
 
     public boolean equals(Object obj)
     {
-        return obj instanceof DefaultSocketFactory;
+       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()
     {
-        return getClass().getName().hashCode();
+       int hashCode = getClass().getName().hashCode();
+       if( bindAddress != null )
+          hashCode += bindAddress.toString().hashCode();
+       return hashCode;
     }
 }