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

[Elias Ross]

  User: genman  
  Date: 06/11/23 14:43:05

  Modified:    src/org/jboss/cache/interceptors  
                        ActivationInterceptor.java
                        CacheLoaderInterceptor.java
  Log:
  JIRA-867 - Fix regression in ActivationInterceptor
  
  Revision  Changes    Path
  1.41      +5 -3      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.40
  retrieving revision 1.41
  diff -u -b -r1.40 -r1.41
  --- ActivationInterceptor.java	20 Nov 2006 03:53:54 -0000	1.40
  +++ ActivationInterceptor.java	23 Nov 2006 19:43:05 -0000	1.41
  @@ -27,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.40 2006/11/20 03:53:54 genman Exp $
  + * @version $Id: ActivationInterceptor.java,v 1.41 2006/11/23 19:43:05 genman Exp $
    */
   public class ActivationInterceptor extends CacheLoaderInterceptor implements ActivationInterceptorMBean
   {
  @@ -198,11 +198,13 @@
       */
      private boolean allInitialized(Node n)
      {
  -      if (n.getNodeSPI().getChildrenLoaded()) return false;
  +      if (!n.getNodeSPI().getChildrenLoaded())
  +         return false;
   
         for (Node child : n.getChildren())
         {
  -         if (child.getKeys().contains(TreeCache.UNINITIALIZED)) return false;
  +         if (child.getKeys().contains(TreeCache.UNINITIALIZED))
  +            return false;
         }
         return true;
      }
  
  
  
  1.61      +5 -1      JBossCache/src/org/jboss/cache/interceptors/CacheLoaderInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheLoaderInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/CacheLoaderInterceptor.java,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -b -r1.60 -r1.61
  --- CacheLoaderInterceptor.java	21 Nov 2006 08:57:02 -0000	1.60
  +++ CacheLoaderInterceptor.java	23 Nov 2006 19:43:05 -0000	1.61
  @@ -33,7 +33,7 @@
    * Loads nodes that don't exist at the time of the call into memory from the CacheLoader
    *
    * @author Bela Ban
  - * @version $Id: CacheLoaderInterceptor.java,v 1.60 2006/11/21 08:57:02 genman Exp $
  + * @version $Id: CacheLoaderInterceptor.java,v 1.61 2006/11/23 19:43:05 genman Exp $
    */
   public class CacheLoaderInterceptor extends BaseCacheLoaderInterceptor implements CacheLoaderInterceptorMBean
   {
  @@ -325,6 +325,10 @@
            {
               reason = "node is uninitialised";
            }
  +		 else if (key == null || !n.getKeys().contains(key))
  +         {
  +            reason = "key not in node";
  +         }
            log.trace("mustLoad reason: " + reason);
         }