From d575fcc19692affa6a0677bbf48fd276552acef4 Mon Sep 17 00:00:00 2001 From: Tomas Cere Date: Fri, 7 Oct 2016 12:21:43 +0200 Subject: [PATCH] Do a proper disconnect when deleting a connector. Change-Id: I1abba51e331eb1f019e5f2fe741f3836f840aae1 Signed-off-by: Tomas Cere (cherry picked from commit fc129a55005ce9d0c1cacfb2538e71fbe56ddd2a) --- .../connect/netconf/listener/NetconfDeviceCommunicator.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicator.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicator.java index 93ac945f2d..91407a5732 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicator.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicator.java @@ -246,10 +246,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 -- 2.36.6