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

[Manik Surtani]

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

  Modified:    src/org/jboss/cache  GlobalTransaction.java
  Log:
  JBCACHE-895
  
  Revision  Changes    Path
  1.18      +3 -4      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.17
  retrieving revision 1.18
  diff -u -b -r1.17 -r1.18
  --- GlobalTransaction.java	6 Dec 2006 13:01:53 -0000	1.17
  +++ GlobalTransaction.java	6 Dec 2006 13:10:31 -0000	1.18
  @@ -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.17 $
  + * @version $Revision: 1.18 $
    */
   public class GlobalTransaction implements Externalizable
   {
  @@ -92,11 +92,10 @@
         if (!(other instanceof GlobalTransaction))
            return false;
   
  -      if (other == null) throw new NullPointerException("GlobalTransaction.compareTo(): other object is null");
  -
         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()