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

[Manik Surtani]

  User: msurtani
  Date: 06/08/21 13:05:50

  Modified:    src/org/jboss/cache    Cache.java TreeCache.java
                        TreeCacheProxyImpl.java
  Log:
  fixed breaking cache loader code
  
  Revision  Changes    Path
  1.6       +8 -0      JBossCache/src/org/jboss/cache/Cache.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Cache.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/Cache.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- Cache.java	15 Aug 2006 21:02:23 -0000	1.5
  +++ Cache.java	21 Aug 2006 17:05:49 -0000	1.6
  @@ -8,6 +8,7 @@
   
   import java.util.List;
   import java.util.Set;
  +import java.util.Map;
   
   /**
    * Along with {@link Node}, this is the central construct of JBoss Cache.
  @@ -80,6 +81,13 @@
   
       /**
        * Convenience method that allows for direct access to the data in a {@link Node}.
  +     * @param fqn
  +     * @param data
  +     */
  +    void put(Fqn fqn, Map data);
  +
  +    /**
  +     * Convenience method that allows for direct access to the data in a {@link Node}.
        * @param fqn <b><i>absolute</i></b> {@link Fqn} to the {@link Node} to be accessed.
        * @param key
        */
  
  
  
  1.222     +4 -3      JBossCache/src/org/jboss/cache/TreeCache.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TreeCache.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/TreeCache.java,v
  retrieving revision 1.221
  retrieving revision 1.222
  diff -u -b -r1.221 -r1.222
  --- TreeCache.java	21 Aug 2006 09:31:27 -0000	1.221
  +++ TreeCache.java	21 Aug 2006 17:05:49 -0000	1.222
  @@ -74,7 +74,7 @@
    * @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
    * @author Brian Stansberry
    * @author Daniel Huang (dhuang at jboss.org)
  - * @version $Id: TreeCache.java,v 1.221 2006/08/21 09:31:27 msurtani Exp $
  + * @version $Id: TreeCache.java,v 1.222 2006/08/21 17:05:49 msurtani Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -2702,7 +2702,8 @@
               log.trace(errStr);
            throw new NodeNotExistsException(errStr);
         }
  -      notifier.notifyNodeModified(fqn, true, Collections.unmodifiableMap(n.getData()));
  +      Map oldData = n.getData();
  +      notifier.notifyNodeModified(fqn, true, oldData == null ? null : Collections.unmodifiableMap(n.getData()));
   
         // TODO: move creation of undo-operations to separate Interceptor
         // create a compensating method call (reverting the effect of
  
  
  
  1.14      +5 -0      JBossCache/src/org/jboss/cache/TreeCacheProxyImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TreeCacheProxyImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/TreeCacheProxyImpl.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- TreeCacheProxyImpl.java	18 Aug 2006 15:40:40 -0000	1.13
  +++ TreeCacheProxyImpl.java	21 Aug 2006 17:05:49 -0000	1.14
  @@ -195,6 +195,11 @@
           treeCache.put(fqn, key, value);
       }
   
  +    public void put(Fqn fqn, Map data)
  +    {
  +        treeCache.put(fqn, data);
  +    }
  +
       public void remove(Fqn fqn, Object key)
       {
           treeCache.remove(fqn, key);