From: Martin Bobak <mbobak@cisco.com>
Date: Wed, 20 Aug 2014 06:50:00 +0000 (+0200)
Subject: FlowCapableTopologyExporter uses merge instead of push when link discovered
X-Git-Tag: release/helium~170^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=1eeb5e88a3593ebd781b733123b8e12cf4cf757c;hp=ce223a4e4d74daee6854e00e9d4e5d3a1bd5c1e8

FlowCapableTopologyExporter uses merge instead of push when link discovered

Change-Id: I4699016749b03f45eb54ad115afa89ba026b620e
Signed-off-by: Martin Bobak <mbobak@cisco.com>
---

diff --git a/opendaylight/md-sal/topology-manager/src/main/java/org/opendaylight/md/controller/topology/manager/FlowCapableTopologyExporter.java b/opendaylight/md-sal/topology-manager/src/main/java/org/opendaylight/md/controller/topology/manager/FlowCapableTopologyExporter.java
index 10aec4ca2e..c1996f4691 100644
--- a/opendaylight/md-sal/topology-manager/src/main/java/org/opendaylight/md/controller/topology/manager/FlowCapableTopologyExporter.java
+++ b/opendaylight/md-sal/topology-manager/src/main/java/org/opendaylight/md/controller/topology/manager/FlowCapableTopologyExporter.java
@@ -151,7 +151,7 @@ class FlowCapableTopologyExporter implements FlowTopologyDiscoveryListener, Open
             public void applyOperation(final ReadWriteTransaction transaction) {
                 final Link link = toTopologyLink(notification);
                 final InstanceIdentifier<Link> path = linkPath(link);
-                transaction.put(LogicalDatastoreType.OPERATIONAL, path, link);
+                transaction.merge(LogicalDatastoreType.OPERATIONAL, path, link, true);
             }
         });
     }