gistfile1.diff

diff --git a/src/java/voldemort/store/routed/RoutedStore.java b/src/java/voldemort/store/routed/Routed
index b4857b3..162d240 100644
--- a/src/java/voldemort/store/routed/RoutedStore.java
+++ b/src/java/voldemort/store/routed/RoutedStore.java
@@ -769,7 +769,8 @@ public class RoutedStore implements Store<ByteArray, byte[]> {
 
         // Okay looks like it worked, increment the version for the caller
         VectorClock versionedClock = (VectorClock) versioned.getVersion();
-        versionedClock.incrementVersion(master.getId(), time.getMilliseconds());
+        VectorClock incrementedClock = versionedClock.incremented(master.getId(), time.getMillisecond
+        versioned.setVersion(incrementedClock);
     }
 
     /**
diff --git a/src/java/voldemort/versioning/Versioned.java b/src/java/voldemort/versioning/Versioned.ja
index 48dd7b4..5d991ef 100644
--- a/src/java/voldemort/versioning/Versioned.java
+++ b/src/java/voldemort/versioning/Versioned.java
@@ -32,7 +32,7 @@ public final class Versioned<T> implements Serializable {
 
     private static final long serialVersionUID = 1;
 
-    private VectorClock version;
+    private volatile VectorClock version;
     private volatile T object;
 
     public Versioned(T object) {
@@ -48,6 +48,10 @@ public final class Versioned<T> implements Serializable {
         return version;
     }
 
+    public void setVersion(VectorClock version) {
+        this.version = version;
+    }
+
     public T getValue() {
         return object;
     }