From a75fec47a1e21e852c38e738858441f790d3007b Mon Sep 17 00:00:00 2001
From: Madan Jampani <madan@onlab.us>
Date: Wed, 11 May 2016 10:34:18 -0700
Subject: [PATCH] Fix for ONOS-4429

Change-Id: I41b56244b2d991eb68cded6e3b15cdc67ef7fa39
---
 .../store/primitives/impl/EventuallyConsistentMapImpl.java   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/EventuallyConsistentMapImpl.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/EventuallyConsistentMapImpl.java
index ba431437c1..19519d0624 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/EventuallyConsistentMapImpl.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/EventuallyConsistentMapImpl.java
@@ -339,11 +339,8 @@ public class EventuallyConsistentMapImpl<K, V>
         checkNotNull(value, ERROR_NULL_VALUE);
 
         MapValue<V> newValue = new MapValue<>(value, timestampProvider.apply(key, value));
-        // Before mutating local map, ensure the update can be serialized without errors.
-        // This prevents replica divergence due to serialization failures.
-        UpdateEntry<K, V> update = serializer.copy(new UpdateEntry<K, V>(key, newValue));
         if (putInternal(key, newValue)) {
-            notifyPeers(update, peerUpdateFunction.apply(key, value));
+            notifyPeers(new UpdateEntry<K, V>(key, newValue), peerUpdateFunction.apply(key, value));
             notifyListeners(new EventuallyConsistentMapEvent<>(mapName, PUT, key, value));
         }
     }