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

[Manik Surtani]

  User: msurtani
  Date: 07/06/29 13:40:50

  Modified:    src/org/jboss/cache/interceptors 
                        CacheLoaderInterceptor.java
  Log:
  JBCACHE-1116 and JBCACHE-1117
  
  Revision  Changes    Path
  1.85      +5 -3      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.84
  retrieving revision 1.85
  diff -u -b -r1.84 -r1.85
  --- CacheLoaderInterceptor.java	18 Jun 2007 23:57:27 -0000	1.84
  +++ CacheLoaderInterceptor.java	29 Jun 2007 17:40:50 -0000	1.85
  @@ -25,7 +25,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.84 2007/06/18 23:57:27 msurtani Exp $
  + * @version $Id: CacheLoaderInterceptor.java,v 1.85 2007/06/29 17:40:50 msurtani Exp $
    */
   public class CacheLoaderInterceptor extends Interceptor implements CacheLoaderInterceptorMBean
   {
  @@ -468,9 +468,11 @@
         return n;
      }
   
  -   private NodeSPI findChild(NodeSPI child, Object child_name)
  +   private NodeSPI findChild(NodeSPI node, Object child_name)
      {
  -      return (NodeSPI) child.getChildrenMapDirect().get(child_name);
  +      Map children = node.getChildrenMapDirect();
  +      if (children == null) return null;
  +      return (NodeSPI) children.get(child_name);
      }
   
      private void cleanupNodesCreated(TransactionEntry entry)