From 4b65b104779988ca197bbf8797afdc3e9b1e6ee4 Mon Sep 17 00:00:00 2001 From: Maros Marsalek Date: Fri, 5 Dec 2014 14:31:37 +0100 Subject: [PATCH] Fix improper cleanup of operational data in sal-netconf-connector's disconnect Use put instead of merge to fully replace operational data on ever yupdate Change-Id: I8ebf19a9bcfaba9cc56be6967999754265e44236 Signed-off-by: Maros Marsalek --- .../connect/netconf/sal/NetconfDeviceDatastoreAdapter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/sal/NetconfDeviceDatastoreAdapter.java b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/sal/NetconfDeviceDatastoreAdapter.java index 04d5e5e449..fc69a7e253 100644 --- a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/sal/NetconfDeviceDatastoreAdapter.java +++ b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/sal/NetconfDeviceDatastoreAdapter.java @@ -58,7 +58,7 @@ final class NetconfDeviceDatastoreAdapter implements AutoCloseable { final ReadWriteTransaction transaction = dataService.newReadWriteTransaction(); logger.trace("{}: Update device state transaction {} merging operational data started.", id, transaction.getIdentifier()); - transaction.merge(LogicalDatastoreType.OPERATIONAL, id.getBindingPath(), data); + transaction.put(LogicalDatastoreType.OPERATIONAL, id.getBindingPath(), data); logger.trace("{}: Update device state transaction {} merging operational data ended.", id, transaction.getIdentifier()); commitTransaction(transaction, "update"); @@ -83,11 +83,11 @@ final class NetconfDeviceDatastoreAdapter implements AutoCloseable { final Node nodeWithId = getNodeWithId(id); logger.trace("{}: Init device state transaction {} putting if absent operational data started.", id, transaction.getIdentifier()); - transaction.merge(LogicalDatastoreType.OPERATIONAL, path, nodeWithId); + transaction.put(LogicalDatastoreType.OPERATIONAL, path, nodeWithId); logger.trace("{}: Init device state transaction {} putting operational data ended.", id, transaction.getIdentifier()); logger.trace("{}: Init device state transaction {} putting if absent config data started.", id, transaction.getIdentifier()); - transaction.merge(LogicalDatastoreType.CONFIGURATION, path, nodeWithId); + transaction.put(LogicalDatastoreType.CONFIGURATION, path, nodeWithId); logger.trace("{}: Init device state transaction {} putting config data ended.", id, transaction.getIdentifier()); commitTransaction(transaction, "init"); -- 2.36.6