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

[Manik Surtani]

  User: msurtani
  Date: 06/11/29 11:04:40

  Modified:    src/org/jboss/cache  Tag: Branch_JBossCache_1_3_0
                        TreeCache.java
  Log:
  updated to deal with invalidations in a tx
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.142.2.5 +3 -2      JBossCache/src/org/jboss/cache/TreeCache.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TreeCache.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/TreeCache.java,v
  retrieving revision 1.142.2.4
  retrieving revision 1.142.2.5
  diff -u -b -r1.142.2.4 -r1.142.2.5
  --- TreeCache.java	29 Nov 2006 03:20:53 -0000	1.142.2.4
  +++ TreeCache.java	29 Nov 2006 16:04:40 -0000	1.142.2.5
  @@ -60,7 +60,7 @@
    * @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
    * @author Brian Stansberry
    * @author Daniel Huang (dhuang at jboss.org)
  - * @version $Id: TreeCache.java,v 1.142.2.4 2006/11/29 03:20:53 msurtani Exp $
  + * @version $Id: TreeCache.java,v 1.142.2.5 2006/11/29 16:04:40 msurtani Exp $
    *          <p/>
    */
   public class TreeCache extends ServiceMBeanSupport implements TreeCacheMBean, Cloneable, MembershipListener
  @@ -4148,7 +4148,8 @@
         // remove subtree from parent
         // parent_node.removeChild(n.getName());
         // don't actually remove the node if pessimistically locked - just mark the node for removal
  -      if (isNodeLockingOptimistic())
  +      // does not apply for eviction
  +      if (isNodeLockingOptimistic() || eviction)
            parent_node.removeChild(n.getName());
         else
            markForRemoval(n);