Remove use of thread-local input

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / main / java / org / opendaylight / controller / cluster / datastore / modification / MergeModification.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/MergeModification.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/MergeModification.java
index 64c75f4620510d0657803af34698d7ed55298f20..6f512acb63cbe1e2252ccab7931dea2fa752a078 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/MergeModification.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/MergeModification.java
@@ -57,7 +57,11 @@ public class MergeModification extends WriteModification {
     @Deprecated
     public static MergeModification fromStream(final ObjectInput in, final short version) {
         MergeModification mod = new MergeModification(version);
-        mod.readExternal(in);
+        try {
+            mod.readExternal(in);
+        } catch (IOException e) {
+            throw new IllegalArgumentException("Error deserializing MergeModification", e);
+        }
         return mod;
     }