[jboss-cvs] JBossCache/src/org/jboss/cache ...

[Manik Surtani]

  User: msurtani
  Date: 06/12/06 08:12:08

  Modified:    src/org/jboss/cache  Tag: Branch_JBossCache_1_4_0
                        GlobalTransaction.java
  Log:
  JBCACHE-895
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.13.2.2  +8 -7      JBossCache/src/org/jboss/cache/GlobalTransaction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: GlobalTransaction.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/GlobalTransaction.java,v
  retrieving revision 1.13.2.1
  retrieving revision 1.13.2.2
  diff -u -b -r1.13.2.1 -r1.13.2.2
  --- GlobalTransaction.java	6 Dec 2006 13:01:19 -0000	1.13.2.1
  +++ GlobalTransaction.java	6 Dec 2006 13:12:08 -0000	1.13.2.2
  @@ -22,7 +22,7 @@
    *
    * @author <a href="mailto:bela at jboss.org">Bela Ban</a> Apr 12, 2003
    * @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
  - * @version $Revision: 1.13.2.1 $
  + * @version $Revision: 1.13.2.2 $
    */
   public class GlobalTransaction implements Externalizable {
      Address addr=null;
  @@ -78,19 +78,20 @@
         return hash_code;
      }
   
  -   public boolean equals(Object other) {
  +   public boolean equals(Object other)
  +   {
         if (this == other)
            return true;
  -      if(!(other instanceof GlobalTransaction))
  +      if (!(other instanceof GlobalTransaction))
            return false;
   
  -      if(other == null) throw new NullPointerException("GlobalTransaction.compareTo(): other object is null");
  -      
  -      GlobalTransaction otherGtx=(GlobalTransaction)other;
  +      GlobalTransaction otherGtx = (GlobalTransaction) other;
   
  -      return (addr == null && otherGtx.addr == null) || (addr != null && otherGtx.addr != null && addr.compareTo(otherGtx.addr) == 0) && id == otherGtx.id;
  +      return ((addr == null && otherGtx.addr == null) || (addr != null && otherGtx.addr != null && addr.compareTo(otherGtx.addr) == 0)) &&
  +                id == otherGtx.id;
      }
   
  +
      public String toString() {
         StringBuffer sb=new StringBuffer();
         sb.append("GlobalTransaction:<").append(addr).append(">:").append(id);