From fe64cb0c9b1b6a19ca511ed6498fe2bf3fff3858 Mon Sep 17 00:00:00 2001
From: Victor Kirhenshtein <victor@netxms.org>
Date: Thu, 8 Sep 2016 21:34:37 +0300
Subject: [PATCH] improved NXCSession cleanup

---
 .../src/main/java/org/netxms/client/NXCSession.java      | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/java/client/netxms-client/src/main/java/org/netxms/client/NXCSession.java b/src/java/client/netxms-client/src/main/java/org/netxms/client/NXCSession.java
index 24e9a5df2..f93641210 100644
--- a/src/java/client/netxms-client/src/main/java/org/netxms/client/NXCSession.java
+++ b/src/java/client/netxms-client/src/main/java/org/netxms/client/NXCSession.java
@@ -1985,6 +1985,12 @@ public class NXCSession
 
       isConnected = false;
       isDisconnected = true;
+      
+      listeners.clear();
+      consoleListeners.clear();
+      messageSubscriptions.clear();
+      receivedFiles.clear();
+      recievedUpdates.clear();
    }
 
    /**
@@ -6874,6 +6880,9 @@ public class NXCSession
     */
    public boolean checkConnection()
    {
+      if (!isConnected)
+         return false;
+      
       final NXCPMessage msg = newMessage(NXCPCodes.CMD_KEEPALIVE);
       try
       {
-- 
2.20.1