From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 26 May 2020 17:27:47 +0000 (+0200)
Subject: Clean up mis-migration
X-Git-Tag: release/aluminium~26
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=174b4d7468ad46a4bc272a0cb4fd322f42c8acd2;p=genius.git

Clean up mis-migration

This is a follow-up to 8a228e4974b9e6909df0a4aa7866eadfee9e438c,
correcting a minor change in semantics.

Change-Id: I4478c1df8b12c7a798c73b9707cf903705cc1587
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/monitoring/ItmTunnelEventListener.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/monitoring/ItmTunnelEventListener.java
index 06c23f92c..a807b0f44 100644
--- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/monitoring/ItmTunnelEventListener.java
+++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/monitoring/ItmTunnelEventListener.java
@@ -379,7 +379,7 @@ public class ItmTunnelEventListener extends AbstractSyncDataTreeChangeListener<S
                     add.getTunnelInterfaceName());
             return Collections.singletonList(txRunner
                 .callWithNewWriteOnlyTransactionAndSubmit(Datastore.OPERATIONAL,
-                    tx -> tx.mergeParentStructureMerge(identifier,
+                    tx -> tx.merge(identifier,
                         new StateTunnelListBuilder(add).setOperState(operStatus).build())));
         }
     }