X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fconnect%2Fnetconf%2Fsal%2FNetconfDeviceDatastoreAdapter.java;h=3715969b2b4188db4ea7a766b4d319cfa62462fc;hp=04d5e5e449e1f00305a8be995b3861d7ef24e47b;hb=4b207b5356775c4b4d231ae979f9f2134f617dd1;hpb=c222e37f2a0f0f3f6266242fbea2d3b018f4e6e3

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..3715969b2b 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
@@ -38,6 +38,7 @@ import org.slf4j.LoggerFactory;
  *
  * All data changes are submitted to an ExecutorService to avoid Thread blocking while sal is waiting for schema.
  */
+@Deprecated
 final class NetconfDeviceDatastoreAdapter implements AutoCloseable {
 
     private static final Logger logger  = LoggerFactory.getLogger(NetconfDeviceDatastoreAdapter.class);
@@ -58,7 +59,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 +84,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");