X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fmodification%2FMergeModification.java;h=6f512acb63cbe1e2252ccab7931dea2fa752a078;hb=e6e14f87df36c0c704ec012d07bfd0ac5b9f1848;hp=64c75f4620510d0657803af34698d7ed55298f20;hpb=4842cd28aa49cdd492d7c49ed06fef00208e1cd7;p=controller.git 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 64c75f4620..6f512acb63 100644 --- 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; }