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

[Brian Stansberry]

  User: bstansberry
  Date: 06/12/21 16:21:05

  Modified:    src/org/jboss/cache  Tag: Branch_JBossCache_1_4_0
                        TreeCache.java
  Log:
  [JBCACHE-913] Do the TreeCacheListener and eviction region notifications as part of the basic state transfer node creation
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.195.2.39 +5 -13     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.195.2.38
  retrieving revision 1.195.2.39
  diff -u -b -r1.195.2.38 -r1.195.2.39
  --- TreeCache.java	21 Dec 2006 04:40:07 -0000	1.195.2.38
  +++ TreeCache.java	21 Dec 2006 21:21:05 -0000	1.195.2.39
  @@ -100,7 +100,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.195.2.38 2006/12/21 04:40:07 bstansberry Exp $
  + * @version $Id: TreeCache.java,v 1.195.2.39 2006/12/21 21:21:05 bstansberry Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -2753,6 +2753,7 @@
            try
            {
               integrator.integrateTransientState(targetRoot, cl);
  +            // JBCACHE-913 -- the integrator now makes this call
               notifyAllNodesCreated(targetRoot);
            }
            catch (Throwable t)
  @@ -6072,6 +6073,8 @@
      /**
       * Generates NodeAdded notifications for all nodes of the tree. This is
       * called whenever the tree is initially retrieved (state transfer)
  +    * 
  +    * @deprecated No longer called
       */
      protected void notifyAllNodesCreated(DataNode curr)
      {
  @@ -6079,18 +6082,7 @@
         Map children;
   
         if (curr == null) return;
  -      Fqn fqn = curr.getFqn();
  -      notifyNodeCreated(fqn);
  -      
  -      // JBCACHE-913
  -      if (evictionRegionManager_ != null)
  -      {
  -         org.jboss.cache.eviction.Region region = evictionRegionManager_.getRegion(fqn);
  -         if (region != null)
  -         {
  -            region.putNodeEvent(new EvictedEventNode(fqn, EvictedEventNode.ADD_NODE_EVENT));
  -         }
  -      }
  +      notifyNodeCreated(curr.getFqn());
         
         if ((children = curr.getChildren()) != null)
         {