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

[Manik Surtani]

  User: msurtani
  Date: 07/01/15 11:19:10

  Modified:    src/org/jboss/cache/loader      AbstractCacheLoader.java
                        CacheLoader.java
  Removed:     src/org/jboss/cache/loader      NodeDataExceptionMarker.java
                        NodeData.java NodeDataMarker.java
  Log:
  * JBCACHE-752
  * Refactored GravitationResult
  * Updated CacheMarshaller200 to marshall GravitateResults and NodeData
  * Moved NodeData (and related objects) to o.j.c.marshall pkg
  
  Revision  Changes    Path
  1.17      +10 -8     JBossCache/src/org/jboss/cache/loader/AbstractCacheLoader.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AbstractCacheLoader.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/loader/AbstractCacheLoader.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  --- AbstractCacheLoader.java	12 Jan 2007 17:02:02 -0000	1.16
  +++ AbstractCacheLoader.java	15 Jan 2007 16:19:10 -0000	1.17
  @@ -11,8 +11,10 @@
   import org.jboss.cache.Fqn;
   import org.jboss.cache.Modification;
   import org.jboss.cache.RegionManager;
  -import org.jboss.cache.marshall.VersionAwareMarshaller;
   import org.jboss.cache.buddyreplication.BuddyManager;
  +import org.jboss.cache.marshall.NodeData;
  +import org.jboss.cache.marshall.NodeDataExceptionMarker;
  +import org.jboss.cache.marshall.VersionAwareMarshaller;
   import org.jboss.cache.util.MapCopy;
   
   import java.io.ObjectInputStream;
  @@ -78,20 +80,20 @@
   
               if (moveToBuddy)
               {
  -               fqn = BuddyManager.getBackupFqn(subtree, nd.fqn);
  +               fqn = BuddyManager.getBackupFqn(subtree, nd.getFqn());
               }
               else
               {
  -               fqn = nd.fqn;
  +               fqn = nd.getFqn();
               }
   
  -            if (nd.attrs != null)
  +            if (nd.getAttributes() != null)
               {
  -               this.put(fqn, nd.attrs, true); // creates a node with 0 or more attributes
  +               this.put(fqn, nd.getAttributes(), true);// creates a node with 0 or more attributes
               }
               else
               {
  -               this.put(fqn, null); // creates a node with null attributes
  +               this.put(fqn, null);// creates a node with null attributes
               }
            }
         }
  @@ -213,7 +215,7 @@
                  remove(m.getFqn());
                  break;
               case MOVE:
  -//                involve moving all children too,
  +               //                involve moving all children too,
                  _move(m.getFqn(), m.getFqn2());
                  break;
               default:
  @@ -234,7 +236,7 @@
         }
         // get data for node.
         Map<Object, Object> data = get(fqn);
  -      if (data != null) // if null, then the node never existed.  Don't bother removing?
  +      if (data != null)// if null, then the node never existed.  Don't bother removing?
         {
            remove(fqn);
            put(newFqn, data);
  
  
  
  1.15      +4 -4      JBossCache/src/org/jboss/cache/loader/CacheLoader.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheLoader.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/loader/CacheLoader.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- CacheLoader.java	2 Jan 2007 17:15:29 -0000	1.14
  +++ CacheLoader.java	15 Jan 2007 16:19:10 -0000	1.15
  @@ -210,7 +210,7 @@
       *
       * @param os ObjectOutputStream to write state
       * @see AbstractCacheLoader#loadEntireState(ObjectOutputStream)
  -    * @see NodeData
  +    * @see org.jboss.cache.marshall.NodeData
       */
      void loadEntireState(ObjectOutputStream os) throws Exception;
   
  @@ -230,7 +230,7 @@
       *
       * @param is ObjectInputStream to read state
       * @see AbstractCacheLoader#storeEntireState(ObjectInputStream)
  -    * @see NodeData
  +    * @see org.jboss.cache.marshall.NodeData
       */
      void storeEntireState(ObjectInputStream is) throws Exception;
   
  @@ -255,7 +255,7 @@
       * @param os      ObjectOutputStream to write state
       * @see AbstractCacheLoader#loadState(Fqn,ObjectOutputStream)
       * @see org.jboss.cache.Region#activate()
  -    * @see NodeData
  +    * @see org.jboss.cache.marshall.NodeData
       */
      void loadState(Fqn subtree, ObjectOutputStream os) throws Exception;
   
  @@ -291,7 +291,7 @@
       *                Fqns should be altered to make them children of
       *                <code>subtree</code> before they are persisted.
       * @see AbstractCacheLoader#storeState(Fqn,ObjectInputStream)
  -    * @see NodeData
  +    * @see org.jboss.cache.marshall.NodeData
       */
      void storeState(Fqn subtree, ObjectInputStream is) throws Exception;