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

[Manik Surtani]

  User: msurtani
  Date: 07/01/19 09:47:40

  Modified:    src/org/jboss/cache/interceptors  
                        OptimisticValidatorInterceptor.java
                        CacheLoaderInterceptor.java
  Log:
  Improved Javadocs
  
  Revision  Changes    Path
  1.55      +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.54
  retrieving revision 1.55
  diff -u -b -r1.54 -r1.55
  --- OptimisticValidatorInterceptor.java	17 Jan 2007 16:24:06 -0000	1.54
  +++ OptimisticValidatorInterceptor.java	19 Jan 2007 14:47:40 -0000	1.55
  @@ -204,7 +204,7 @@
                  Map mergedData = wrappedNode.getMergedData();
   
                  current.clearDataDirect();
  -               current.putDirect(mergedData);
  +               current.putAllDirect(mergedData);
   
                  if (wrappedNode.isVersioningImplicit())
                  {
  
  
  
  1.74      +3 -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.73
  retrieving revision 1.74
  diff -u -b -r1.73 -r1.74
  --- CacheLoaderInterceptor.java	17 Jan 2007 16:24:06 -0000	1.73
  +++ CacheLoaderInterceptor.java	19 Jan 2007 14:47:40 -0000	1.74
  @@ -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.73 2007/01/17 16:24:06 msurtani Exp $
  + * @version $Id: CacheLoaderInterceptor.java,v 1.74 2007/01/19 14:47:40 msurtani Exp $
    */
   public class CacheLoaderInterceptor extends BaseCacheLoaderInterceptor implements CacheLoaderInterceptorMBean
   {
  @@ -294,7 +294,7 @@
            if ((isMove || isActivation) && recursive)
            {
               // load data for children as well!
  -            child.putDirect(loader.get(child.getFqn()));
  +            child.putAllDirect(loader.get(child.getFqn()));
               child.setDataLoaded(true);
            }
            else
  @@ -429,7 +429,7 @@
            log.trace("Node data is not null, loading");
            n = createNodes(fqn, entry);
   //         n.clearDataDirect();
  -         n.putDirect(nodeData);
  +         n.putAllDirect(nodeData);
         }
   
         if (n != null && !n.getDataLoaded())