From: Tomas Cere <tcere@cisco.com>
Date: Thu, 26 Feb 2015 09:07:10 +0000 (+0100)
Subject: BUG-2739 Fixed leftover data when removing NETCONF device from topology
X-Git-Tag: release/lithium~465
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=009fc930faca431bc6802885c28ccdfe3b1ab86f;hp=499c589d42fa52af58d85805aefe135f46d76787

BUG-2739 Fixed leftover data when removing NETCONF device from topology

Change-Id: I73c8a5e27b8bf72f2aecf29699ce54ed872ad348
Signed-off-by: Tomas Cere <tcere@cisco.com>
---

diff --git a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/sal/NetconfDeviceSalProvider.java b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/sal/NetconfDeviceSalProvider.java
index dfae165d30..568ebde0d3 100644
--- a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/sal/NetconfDeviceSalProvider.java
+++ b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/sal/NetconfDeviceSalProvider.java
@@ -91,6 +91,8 @@ final class NetconfDeviceSalProvider implements AutoCloseable, Provider, Binding
         mountInstance.close();
         datastoreAdapter.close();
         datastoreAdapter = null;
+        topologyDatastoreAdapter.close();
+        topologyDatastoreAdapter = null;
     }
 
     static final class MountInstance implements AutoCloseable {