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

[Elias Ross]

  User: genman  
  Date: 06/11/20 00:09:15

  Modified:    src/org/jboss/cache  TreeCache.java
  Log:
  JBCACHE-867 - Fix impl dependence on getData() being a copy
  
  Revision  Changes    Path
  1.280     +7 -7      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.279
  retrieving revision 1.280
  diff -u -b -r1.279 -r1.280
  --- TreeCache.java	20 Nov 2006 03:53:54 -0000	1.279
  +++ TreeCache.java	20 Nov 2006 05:09:15 -0000	1.280
  @@ -95,7 +95,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.279 2006/11/20 03:53:54 genman Exp $
  + * @version $Id: TreeCache.java,v 1.280 2006/11/20 05:09:15 genman Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -2246,8 +2246,7 @@
            }
            throw new NodeNotExistsException(errStr);
         }
  -      Map oldData = n.getData();
  -      notifier.notifyNodeModified(fqn, true, oldData == null ? Collections.emptyMap() : Collections.unmodifiableMap(n.getData()));
  +      notifier.notifyNodeModified(fqn, true, n.getNodeSPI().getRawData());;
   
         // TODO: move creation of undo-operations to separate Interceptor
         // create a compensating method call (reverting the effect of
  @@ -2321,7 +2320,7 @@
            throw new NodeNotExistsException(errStr);
         }
   
  -      notifier.notifyNodeModified(fqn, true, n.getData() == null ? Collections.emptyMap() : Collections.unmodifiableMap(n.getData()));
  +      notifier.notifyNodeModified(fqn, true, n.getNodeSPI().getRawData());
         getInvocationContext().getOptionOverrides().setBypassInterceptorChain(true);
         old_value = n.put(key, value);
         getInvocationContext().getOptionOverrides().setBypassInterceptorChain(false);
  @@ -2525,7 +2524,7 @@
            return null;
         }
   
  -      notifier.notifyNodeModified(fqn, true, n.getData() == null ? Collections.emptyMap() : Collections.unmodifiableMap(n.getData()));
  +      notifier.notifyNodeModified(fqn, true, n.getNodeSPI().getRawData());
   
         old_value = n.remove(key);
   
  @@ -2538,7 +2537,8 @@
            tx_table.addUndoOperation(tx, undo_op);
         }
   
  -      notifier.notifyNodeModified(fqn, false, n.getData() == null ? Collections.emptyMap() : Collections.unmodifiableMap(n.getData()));
  +      notifier.notifyNodeModified(fqn, false, n.getNodeSPI().getRawData());
  +
         return old_value;
      }
   
  @@ -2615,7 +2615,7 @@
         }
         else
         {
  -         notifier.notifyNodeModified(fqn, true, n.getData() == null ? Collections.emptyMap() : Collections.unmodifiableMap(n.getData()));
  +         notifier.notifyNodeModified(fqn, true, n.getNodeSPI().getRawData());
         }
   
         n.clearData();