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

[Manik Surtani]

  User: msurtani
  Date: 07/03/07 17:46:29

  Modified:    src/org/jboss/cache  Tag: Branch_JBossCache_1_4_0
                        OptimisticTreeNode.java
  Log:
  JBCACHE-961 - more sophisticated merging of child maps in workspace nodes backported to 1.4.x
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.13.2.2  +19 -2     JBossCache/src/org/jboss/cache/Attic/OptimisticTreeNode.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: OptimisticTreeNode.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/Attic/OptimisticTreeNode.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
  --- OptimisticTreeNode.java	29 Dec 2006 14:40:11 -0000	1.13.2.1
  +++ OptimisticTreeNode.java	7 Mar 2007 22:46:29 -0000	1.13.2.2
  @@ -115,4 +115,21 @@
           return super.toString() + "\n(Optimistically locked node)\n";
       }
       
  +   public boolean equals(Object other)
  +   {
  +      if (other != null && other instanceof OptimisticTreeNode)
  +      {
  +         if (other == this) return true;
  +         Fqn otherFqn = ((OptimisticTreeNode) other).getFqn();
  +         if (fqn == null) return otherFqn == null;
  +         return fqn.equals(otherFqn);
  +      }
  +      return false;
  +   }
  +
  +   public int hashCode()
  +   {
  +      if (fqn == null) return 100;
  +      return fqn.hashCode() * 22;
  +   }   
   }