X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FShardRecoveryCoordinator.java;fp=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FShardRecoveryCoordinator.java;h=634121f5e5e669b5038246876ea0228b454edfe5;hp=82a6b720f07d05303991235619515641af02acd6;hb=7ec296abdea94bbdc336276731ee545a2fb13e7c;hpb=95e221e8ddf771b9600d0acb4df9951246ffb987 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardRecoveryCoordinator.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardRecoveryCoordinator.java index 82a6b720f0..634121f5e5 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardRecoveryCoordinator.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardRecoveryCoordinator.java @@ -11,7 +11,6 @@ import com.google.common.base.Preconditions; import java.io.IOException; import java.net.URI; import java.util.Set; -import org.opendaylight.controller.cluster.datastore.modification.ModificationPayload; import org.opendaylight.controller.cluster.datastore.modification.MutableCompositeModification; import org.opendaylight.controller.cluster.datastore.node.utils.transformer.NormalizedNodePruner; import org.opendaylight.controller.cluster.datastore.utils.PruningDataTreeModification; @@ -70,10 +69,6 @@ class ShardRecoveryCoordinator implements RaftActorRecoveryCohort { if (payload instanceof DataTreeCandidatePayload) { DataTreeCandidates.applyToModification(transaction, ((DataTreeCandidatePayload)payload).getCandidate()); size++; - } else if (payload instanceof ModificationPayload) { - MutableCompositeModification.fromSerializable( - ((ModificationPayload) payload).getModification()).apply(transaction); - size++; } else if (payload instanceof CompositeModificationPayload) { MutableCompositeModification.fromSerializable( ((CompositeModificationPayload) payload).getModification()).apply(transaction); @@ -85,7 +80,7 @@ class ShardRecoveryCoordinator implements RaftActorRecoveryCohort { } else { log.error("{}: Unknown payload {} received during recovery", shardName, payload); } - } catch (IOException | ClassNotFoundException e) { + } catch (IOException e) { log.error("{}: Error extracting ModificationPayload", shardName, e); } }