BUG-865: remove the use of ModificationType.MERGE 07/27107/2
authorRobert Varga <rovarga@cisco.com>
Thu, 17 Sep 2015 03:34:55 +0000 (05:34 +0200)
committerGerrit Code Review <gerrit@opendaylight.org>
Thu, 17 Sep 2015 15:12:31 +0000 (15:12 +0000)
This event is deprecated and is not produced, remove references to it.

Change-Id: I181168a923929a53806164b5ffd530db2c18c299
Signed-off-by: Robert Varga <rovarga@cisco.com>
opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/ResolveDataChangeEventsTask.java

index 07a9fb7..5c7ff7d 100644 (file)
@@ -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;

©2013 OpenDaylight, A Linux Foundation Collaborative Project. All Rights Reserved.
OpenDaylight is a registered trademark of The OpenDaylight Project, Inc.
Linux Foundation and OpenDaylight are registered trademarks of the Linux Foundation.
Linux is a registered trademark of Linus Torvalds.