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

[Manik Surtani]

  User: msurtani
  Date: 07/01/09 21:03:01

  Modified:    src/org/jboss/cache/interceptors  
                        CacheLoaderInterceptor.java
                        OptimisticValidatorInterceptor.java
  Log:
  Bunch of API changes
  
  Revision  Changes    Path
  1.71      +7 -7      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.70
  retrieving revision 1.71
  diff -u -b -r1.70 -r1.71
  --- CacheLoaderInterceptor.java	4 Jan 2007 23:52:06 -0000	1.70
  +++ CacheLoaderInterceptor.java	10 Jan 2007 02:03:00 -0000	1.71
  @@ -28,7 +28,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.70 2007/01/04 23:52:06 bstansberry Exp $
  + * @version $Id: CacheLoaderInterceptor.java,v 1.71 2007/01/10 02:03:00 msurtani Exp $
    */
   public class CacheLoaderInterceptor extends BaseCacheLoaderInterceptor implements CacheLoaderInterceptorMBean
   {
  @@ -271,7 +271,7 @@
            {
               if (useCacheStore)
               {
  -               node.getChildrenMap().clear();
  +               node.getChildrenMapDirect().clear();
               }
               node.setChildrenLoaded(true);
            }
  @@ -499,7 +499,7 @@
   
      private NodeSPI findChild(NodeSPI child, Object child_name)
      {
  -      return (NodeSPI) child.getChildrenMap().get(child_name);
  +      return (NodeSPI) child.getChildrenMapDirect().get(child_name);
      }
   
      private void cleanupNodesCreated(TransactionEntry entry)
  @@ -549,10 +549,10 @@
   
         // BES Jan-4-2007 Stop doing this; it's annoying and people
         // should have converted by now
  -//      if (!nodeExists && isCustomCacheLoader)
  -//      {
  -//         warnCustom();
  -//      }
  +      //      if (!nodeExists && isCustomCacheLoader)
  +      //      {
  +      //         warnCustom();
  +      //      }
   
         if (nodeExists)
         {
  
  
  
  1.52      +1 -1      JBossCache/src/org/jboss/cache/interceptors/OptimisticValidatorInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: OptimisticValidatorInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/OptimisticValidatorInterceptor.java,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -b -r1.51 -r1.52
  --- OptimisticValidatorInterceptor.java	4 Jan 2007 14:36:00 -0000	1.51
  +++ OptimisticValidatorInterceptor.java	10 Jan 2007 02:03:01 -0000	1.52
  @@ -197,7 +197,7 @@
                  Map mergedChildren = wrappedNode.getMergedChildren();
   
                  // this could be done better to account for more subtle merges
  -               current.setChildrenMap(mergedChildren);
  +               current.setChildrenMapDirect(mergedChildren);
   
                  // do we need to notify listeners of a modification??  If all we've done is added children then don't
                  // notify.