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

[Manik Surtani]

  User: msurtani
  Date: 07/05/30 07:52:48

  Modified:    src/org/jboss/cache/interceptors  ActivationInterceptor.java
  Log:
  JBCACHE-1073
  
  Revision  Changes    Path
  1.56      +7 -6      JBossCache/src/org/jboss/cache/interceptors/ActivationInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ActivationInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/ActivationInterceptor.java,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -b -r1.55 -r1.56
  --- ActivationInterceptor.java	30 May 2007 11:35:14 -0000	1.55
  +++ ActivationInterceptor.java	30 May 2007 11:52:48 -0000	1.56
  @@ -13,6 +13,7 @@
   import javax.transaction.TransactionManager;
   import java.lang.reflect.Method;
   import java.util.ArrayList;
  +import java.util.Collections;
   import java.util.HashMap;
   import java.util.Iterator;
   import java.util.List;
  @@ -26,7 +27,7 @@
    * their attributes have been initialized and their children have been loaded in memory.
    *
    * @author <a href="mailto:{hmesha at novell.com}">{Hany Mesha}</a>
  - * @version $Id: ActivationInterceptor.java,v 1.55 2007/05/30 11:35:14 msurtani Exp $
  + * @version $Id: ActivationInterceptor.java,v 1.56 2007/05/30 11:52:48 msurtani Exp $
    */
   public class ActivationInterceptor extends CacheLoaderInterceptor implements ActivationInterceptorMBean
   {
  @@ -185,7 +186,7 @@
   
      private void remove(InvocationContext ctx, Fqn fqn) throws Exception
      {
  -      cache.getNotifier().notifyNodeActivated(fqn, true, blahDeBlah, ctx, true);
  +      cache.getNotifier().notifyNodeActivated(fqn, true, Collections.emptyMap(), ctx, true);
         loader.remove(fqn);
         if (configuration.getExposeManagementStatistics() && getStatisticsEnabled())
         {
  @@ -318,13 +319,13 @@
                        if (!n.getChildrenDirect().isEmpty() && allInitialized(n))
                        {
                           // children have been loaded, remove the node
  -                        addRemoveMod(ctx, cache_loader_modifications, fqn);
  +                        addRemoveMod(ctx, cache_loader_modifications, fqn, n.getDataDirect());
                           txActs++;
                        }
                        // doesn't have children, check the cache loader
                        else if (loaderNoChildren(fqn))
                        {
  -                        addRemoveMod(ctx, cache_loader_modifications, fqn);
  +                        addRemoveMod(ctx, cache_loader_modifications, fqn, n.getDataDirect());
                           txActs++;
                        }
                     }
  @@ -342,11 +343,11 @@
         }
      }
   
  -   private void addRemoveMod(InvocationContext ctx, List l, Fqn fqn)
  +   private void addRemoveMod(InvocationContext ctx, List l, Fqn fqn, Map data)
      {
         Modification mod = new Modification(Modification.ModificationType.REMOVE_NODE, fqn);
         l.add(mod);
  -      cache.getNotifier().notifyNodeActivated(fqn, false, blahDeBlah, ctx, true);
  +      cache.getNotifier().notifyNodeActivated(fqn, false, data, ctx, true);
      }
   
   }