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

[Manik Surtani]

  User: msurtani
  Date: 07/01/09 22:55:41

  Modified:    src/org/jboss/cache/interceptors  
                        OptimisticValidatorInterceptor.java
                        CacheLoaderInterceptor.java
  Log:
  fixed some api issues
  
  Revision  Changes    Path
  1.53      +3 -4      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.52
  retrieving revision 1.53
  diff -u -b -r1.52 -r1.53
  --- OptimisticValidatorInterceptor.java	10 Jan 2007 02:03:01 -0000	1.52
  +++ OptimisticValidatorInterceptor.java	10 Jan 2007 03:55:41 -0000	1.53
  @@ -202,11 +202,10 @@
                  // do we need to notify listeners of a modification??  If all we've done is added children then don't
                  // notify.
                  Map mergedData = wrappedNode.getMergedData();
  -               Map rawData = current.getDataDirect();
   
  -               Map raw = current.getDataDirect();
  -               raw.clear();
  -               raw.putAll(mergedData);
  +               current.clearDataDirect();
  +               current.putDirect(mergedData);
  +
                  if (wrappedNode.isVersioningImplicit())
                  {
                     if (trace) log.trace("Versioning is implicit; incrementing.");
  
  
  
  1.72      +4 -5      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.71
  retrieving revision 1.72
  diff -u -b -r1.71 -r1.72
  --- CacheLoaderInterceptor.java	10 Jan 2007 02:03:00 -0000	1.71
  +++ CacheLoaderInterceptor.java	10 Jan 2007 03:55:41 -0000	1.72
  @@ -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.71 2007/01/10 02:03:00 msurtani Exp $
  + * @version $Id: CacheLoaderInterceptor.java,v 1.72 2007/01/10 03:55:41 msurtani Exp $
    */
   public class CacheLoaderInterceptor extends BaseCacheLoaderInterceptor implements CacheLoaderInterceptorMBean
   {
  @@ -271,7 +271,7 @@
            {
               if (useCacheStore)
               {
  -               node.getChildrenMapDirect().clear();
  +               node.removeChildrenDirect();//getChildrenMapDirect().clear();
               }
               node.setChildrenLoaded(true);
            }
  @@ -291,11 +291,10 @@
   
            // create child if it didn't exist
            NodeSPI child = node.addChildDirect(child_fqn);
  -         Map childMap = child.getDataDirect();
            if ((isMove || isActivation) && recursive)
            {
               // load data for children as well!
  -            childMap.putAll(loader.get(child.getFqn()));
  +            child.putDirect(loader.get(child.getFqn()));
               child.setDataLoaded(true);
            }
            else
  @@ -429,7 +428,7 @@
         {
            log.trace("Node data is not null, loading");
            n = createNodes(fqn, entry);
  -         n.clearDataDirect();
  +//         n.clearDataDirect();
            n.putDirect(nodeData);
         }