updates to EventuallyConsistenMapImpl to improve parallelism

Change-Id: I7bf29c02380f630e592d980d0795efc6ac13167a

@@ -258,23 +258,28 @@ public class EventuallyConsistentMapImpl<K, V>
     }
     }
 
 
     private boolean putInternal(K key, V value, Timestamp timestamp) {
     private boolean putInternal(K key, V value, Timestamp timestamp) {
-        synchronized (this) {
         Timestamp removed = removedItems.get(key);
         Timestamp removed = removedItems.get(key);
         if (removed != null && removed.compareTo(timestamp) > 0) {
         if (removed != null && removed.compareTo(timestamp) > 0) {
             log.debug("ecmap - removed was newer {}", value);
             log.debug("ecmap - removed was newer {}", value);
             return false;
             return false;
         }
         }
 
 
+        boolean success;
+        synchronized (this) {
             Timestamped<V> existing = items.get(key);
             Timestamped<V> existing = items.get(key);
             if (existing != null && existing.isNewer(timestamp)) {
             if (existing != null && existing.isNewer(timestamp)) {
                 log.debug("ecmap - existing was newer {}", value);
                 log.debug("ecmap - existing was newer {}", value);
-                return false;
+                success = false;
             } else {
             } else {
                 items.put(key, new Timestamped<>(value, timestamp));
                 items.put(key, new Timestamped<>(value, timestamp));
-                removedItems.remove(key);
-                return true;
+                success = true;
             }
             }
         }
         }
+
+        if (success && removed != null) {
+            removedItems.remove(key, removed);
+        }
+        return success;
     }
     }
 
 
     @Override
     @Override

@@ -77,6 +77,7 @@ public final class Timestamped<T> {
      * @param other timestamp to compare against
      * @param other timestamp to compare against
      * @return true if this instance is newer
      * @return true if this instance is newer
      */
      */
+    //TODO put this in Timestamp
     public boolean isNewer(Timestamp other) {
     public boolean isNewer(Timestamp other) {
         return this.timestamp.compareTo(checkNotNull(other)) > 0;
         return this.timestamp.compareTo(checkNotNull(other)) > 0;
     }
     }