From: Tomas Cere <tcere@cisco.com>
Date: Fri, 7 Oct 2016 11:36:06 +0000 (+0200)
Subject: Do a proper disconnect when deleting a connector.
X-Git-Tag: release/beryllium-sr4~3
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F68%2F46668%2F1;p=netconf.git

Do a proper disconnect when deleting a connector.

Change-Id: I1abba51e331eb1f019e5f2fe741f3836f840aae1
Signed-off-by: Tomas Cere <tcere@cisco.com>
(cherry picked from commit fc129a55005ce9d0c1cacfb2538e71fbe56ddd2a)
---

diff --git a/opendaylight/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicator.java b/opendaylight/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicator.java
index aa8afbc664..5fdd9d600c 100644
--- a/opendaylight/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicator.java
+++ b/opendaylight/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicator.java
@@ -241,10 +241,8 @@ public class NetconfDeviceCommunicator implements NetconfClientSessionListener,
             initFuture.cancel(false);
         }
         // Disconnect from device
-        if(session != null) {
-            session.close();
-            // tear down not necessary, called indirectly by above close
-        }
+        // tear down not necessary, called indirectly by the close in disconnect()
+        disconnect();
     }
 
     @Override