From 4ea71164738ce27d00cd7bc801e029fcab432793 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 17 Sep 2015 05:34:55 +0200 Subject: [PATCH 1/1] BUG-865: remove the use of ModificationType.MERGE This event is deprecated and is not produced, remove references to it. Change-Id: I181168a923929a53806164b5ffd530db2c18c299 Signed-off-by: Robert Varga --- .../md/sal/dom/store/impl/ResolveDataChangeEventsTask.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/ResolveDataChangeEventsTask.java b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/ResolveDataChangeEventsTask.java index 07a9fb7a88..5c7ff7df1e 100644 --- a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/ResolveDataChangeEventsTask.java +++ b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/ResolveDataChangeEventsTask.java @@ -118,7 +118,6 @@ public final class ResolveDataChangeEventsTask { switch (type) { case SUBTREE_MODIFIED: return resolveSubtreeChangeEvent(state, node); - case MERGE: case WRITE: Preconditions.checkArgument(maybeAfter.isPresent(), "Modification at {} has type {} but no after-data", state.getPath(), type); @@ -279,7 +278,6 @@ public final class ResolveDataChangeEventsTask { switch (childMod.getModificationType()) { case WRITE: - case MERGE: case DELETE: if (resolveAnyChangeEvent(childState, childMod)) { scope = DataChangeScope.ONE; -- 2.36.6