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

[Manik Surtani]

  User: msurtani
  Date: 06/12/11 09:46:54

  Modified:    src/org/jboss/cache/optimistic   Tag:
                        Branch_JBossCache_1_4_0 DefaultDataVersion.java
                        WorkspaceNodeImpl.java
  Log:
  Fixed weird bugs
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.2   +21 -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.1
  retrieving revision 1.3.2.2
  diff -u -b -r1.3.2.1 -r1.3.2.2
  --- DefaultDataVersion.java	6 Dec 2006 16:00:14 -0000	1.3.2.1
  +++ DefaultDataVersion.java	11 Dec 2006 14:46:54 -0000	1.3.2.2
  @@ -6,14 +6,24 @@
    */
   package org.jboss.cache.optimistic;
   
  +import java.io.Externalizable;
  +import java.io.ObjectOutput;
  +import java.io.IOException;
  +import java.io.ObjectInput;
  +
   /**
    * The default implementation of a DataVersion, uses a <code>long</code> to
    * compare versions.
  + *
    * This class is immutable.
    *
  + * Also note that this is meant to control implicit, internal versioning.  Do not attempt to instantiate or use instances
  + * of this class explicitly, via the {@link org.jboss.cache.config.Option#setDataVersion(DataVersion)} API, as it WILL
  + * break things.
  + *
    * @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
    */
  -public class DefaultDataVersion implements DataVersion
  +public class DefaultDataVersion implements DataVersion, Externalizable
   {
   
       /**
  @@ -36,7 +46,6 @@
   
       /**
        * Constructs with version 0.
  -     * @deprecated use {@link #ZERO} constant
        */
       public DefaultDataVersion()
       {
  @@ -95,4 +104,14 @@
      {
         return version;
      }
  +
  +   public void writeExternal(ObjectOutput objectOutput) throws IOException
  +   {
  +      objectOutput.writeLong(version);
  +   }
  +
  +   public void readExternal(ObjectInput objectInput) throws IOException, ClassNotFoundException
  +   {
  +      version = objectInput.readLong();
  +   }
   }
  
  
  
  1.21.2.3  +4 -6      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.2
  retrieving revision 1.21.2.3
  diff -u -b -r1.21.2.2 -r1.21.2.3
  --- WorkspaceNodeImpl.java	13 Nov 2006 13:00:04 -0000	1.21.2.2
  +++ WorkspaceNodeImpl.java	11 Dec 2006 14:46:54 -0000	1.21.2.3
  @@ -210,12 +210,10 @@
                   optimisticChildNodeMap = new ConcurrentReaderHashMap();
               optimisticChildNodeMap.put(child_name, child);
           }
  -        if (log.isTraceEnabled())
  -        {
  -            log.trace("createChild: fqn=" + fqn);
  -        }
           // TODO: MANIK: Remove dirty=true, implement merging on child mods instead.
           dirty = true;
  +
  +        if (log.isTraceEnabled()) log.trace("createChild: fqn=" + fqn + " for node " + this);
           return child;
   
       }