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

[Manik Surtani]

  User: msurtani
  Date: 06/08/22 07:38:54

  Modified:    src/org/jboss/cache  TreeCacheProxyImpl.java
  Log:
  Fixed breakage in passivation code
  
  Revision  Changes    Path
  1.15      +7 -1      JBossCache/src/org/jboss/cache/TreeCacheProxyImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TreeCacheProxyImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/TreeCacheProxyImpl.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- TreeCacheProxyImpl.java	21 Aug 2006 17:05:49 -0000	1.14
  +++ TreeCacheProxyImpl.java	22 Aug 2006 11:38:54 -0000	1.15
  @@ -405,7 +405,13 @@
           {
               log.warn("Did you mean to call removeNode() instead?  remove() just removes data in the node under the key passed in.");
           }
  -        return treeCache.remove(currentNode.getFqn(), k);
  +        if (treeCache.getInvocationContext().getOptionOverrides().isBypassInterceptorChain())
  +        {
  +            Object value = currentNode.remove(k);
  +            treeCache.getInvocationContext().getOptionOverrides().setBypassInterceptorChain(false);
  +            return value;
  +        }
  +        else return treeCache.remove(currentNode.getFqn(), k);
       }
   
       public void clearData()