[jboss-cvs] JBossRemoting/src/main/org/jboss/remoting/transport/socket ...

[Ovidiu Feodorov]

  User: ovidiu  
  Date: 07/02/03 18:31:17

  Modified:    src/main/org/jboss/remoting/transport/socket  Tag:
                        remoting_2_x ServerAddress.java
  Log:
  fixed broken ServerAddress.equals() http://jira.jboss.org/jira/browse/JBREM-696
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4.4.1   +17 -4     JBossRemoting/src/main/org/jboss/remoting/transport/socket/ServerAddress.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServerAddress.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/socket/ServerAddress.java,v
  retrieving revision 1.4
  retrieving revision 1.4.4.1
  diff -u -b -r1.4 -r1.4.4.1
  --- ServerAddress.java	27 Apr 2006 18:00:50 -0000	1.4
  +++ ServerAddress.java	3 Feb 2007 23:31:17 -0000	1.4.4.1
  @@ -33,7 +33,7 @@
    * is used as a key in a hashmap mainted by the ConnectionManager.
    *
    * @author <a href="mailto:hiram.chirino at jboss.org">Hiram Chirino</a>
  - * @version $Revision: 1.4 $
  + * @version $Revision: 1.4.4.1 $
    */
   public class ServerAddress implements Serializable
   {
  @@ -82,11 +82,14 @@
         {
            this.timeout = timeout;
         }
  +      this.hashCode = 7 * this.hashCode + timeout;
      }
   
      public String toString()
      {
  -      return "[address:" + address + ",port:" + port + ",enableTcpNoDelay:" + enableTcpNoDelay + "]";
  +      return "ServerAddress[" + address + ":" + port +
  +         (enableTcpNoDelay ? ", enableTcpNoDelay" : ", NO enableTcpNoDelay") +
  +         " timeout " + timeout + " ms]";
      }
   
      public boolean equals(Object obj)
  @@ -94,19 +97,28 @@
         try
         {
            // Compare this to obj
  -         ServerAddress o = (ServerAddress) obj;
  +         ServerAddress o = (ServerAddress)obj;
  +
            if (port != o.port)
            {
               return false;
            }
  -         if (address.equals(o.address) == false)
  +
  +         if (!address.equals(o.address))
            {
               return false;
            }
  +
            if (enableTcpNoDelay != o.enableTcpNoDelay)
            {
               return false;
            }
  +
  +         if (timeout != o.timeout)
  +         {
  +            return false;
  +         }
  +
            return true;
         }
         catch (Throwable e)
  @@ -138,6 +150,7 @@
         {
            this.hashCode ++;
         }
  +      this.hashCode = 7 * this.hashCode + timeout;
      }