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

[Manik Surtani]

  User: msurtani
  Date: 06/12/11 12:29:45

  Modified:    src/org/jboss/cache/optimistic    Tag:
                        Branch_JBossCache_1_4_0 DefaultDataVersion.java
                        WorkspaceNodeImpl.java WorkspaceNode.java
  Log:
  Fixed a bunch of problems with Optimistic data versioning related to JBCACHE-894
  Updated logging libs JBCACHE-901
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.3   +2 -2      JBossCache/src/org/jboss/cache/optimistic/DefaultDataVersion.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DefaultDataVersion.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/optimistic/DefaultDataVersion.java,v
  retrieving revision 1.3.2.2
  retrieving revision 1.3.2.3
  diff -u -b -r1.3.2.2 -r1.3.2.3
  --- DefaultDataVersion.java	11 Dec 2006 14:46:54 -0000	1.3.2.2
  +++ DefaultDataVersion.java	11 Dec 2006 17:29:45 -0000	1.3.2.3
  @@ -7,9 +7,9 @@
   package org.jboss.cache.optimistic;
   
   import java.io.Externalizable;
  -import java.io.ObjectOutput;
   import java.io.IOException;
   import java.io.ObjectInput;
  +import java.io.ObjectOutput;
   
   /**
    * The default implementation of a DataVersion, uses a <code>long</code> to
  @@ -25,7 +25,7 @@
    */
   public class DefaultDataVersion implements DataVersion, Externalizable
   {
  -
  +    private static final long serialVersionUID = -6896315742831861046L;
       /**
        * Version zero.
        * Assign this as the first version to your data.
  
  
  
  1.21.2.4  +12 -1     JBossCache/src/org/jboss/cache/optimistic/WorkspaceNodeImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WorkspaceNodeImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/optimistic/WorkspaceNodeImpl.java,v
  retrieving revision 1.21.2.3
  retrieving revision 1.21.2.4
  diff -u -b -r1.21.2.3 -r1.21.2.4
  --- WorkspaceNodeImpl.java	11 Dec 2006 14:46:54 -0000	1.21.2.3
  +++ WorkspaceNodeImpl.java	11 Dec 2006 17:29:45 -0000	1.21.2.4
  @@ -45,6 +45,7 @@
       private boolean created;
       private Map optimisticChildNodeMap;
       private Map optimisticDataMap;
  +   private boolean versioningImplicit;
   
       public WorkspaceNodeImpl() {
           this(new OptimisticTreeNode(), null);
  @@ -218,6 +219,16 @@
   
       }
   
  +   public boolean isVersioningImplicit()
  +   {
  +      return versioningImplicit;
  +   }
  +
  +   public void setVersioningImplicit(boolean b)
  +   {
  +      versioningImplicit = b;
  +   }
  +
       //this needs to be changed to return wrapped node
       public TreeNode getChild(Object childName)
       {
  
  
  
  1.12.2.1  +5 -1      JBossCache/src/org/jboss/cache/optimistic/WorkspaceNode.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WorkspaceNode.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/optimistic/WorkspaceNode.java,v
  retrieving revision 1.12
  retrieving revision 1.12.2.1
  diff -u -b -r1.12 -r1.12.2.1
  --- WorkspaceNode.java	31 May 2006 14:08:39 -0000	1.12
  +++ WorkspaceNode.java	11 Dec 2006 17:29:45 -0000	1.12.2.1
  @@ -7,9 +7,9 @@
   package org.jboss.cache.optimistic;
   
   import org.jboss.cache.DataNode;
  -import org.jboss.cache.TreeNode;
   import org.jboss.cache.Fqn;
   import org.jboss.cache.TreeCache;
  +import org.jboss.cache.TreeNode;
   
   import java.util.Map;
   import java.util.Set;
  @@ -50,4 +50,8 @@
       public void markAsCreated();
   
       public TreeNode createChild(Object child_name, Fqn fqn, TreeNode parent, TreeCache cache, DataVersion version);
  +
  +   boolean isVersioningImplicit();
  +
  +   void setVersioningImplicit(boolean b);
   }