improved NXCSession cleanup

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 24e9a5d..f936412 100644 (file)
--- 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;
 
       isConnected = false;
       isDisconnected = true;

+      
+      listeners.clear();
+      consoleListeners.clear();
+      messageSubscriptions.clear();
+      receivedFiles.clear();
+      recievedUpdates.clear();

    }
 
    /**
    }
 
    /**


@@ -6874,6 +6880,9 @@ public class NXCSession
     */
    public boolean checkConnection()
    {
     */
    public boolean checkConnection()
    {

+      if (!isConnected)
+         return false;
+      

       final NXCPMessage msg = newMessage(NXCPCodes.CMD_KEEPALIVE);
       try
       {
       final NXCPMessage msg = newMessage(NXCPCodes.CMD_KEEPALIVE);
       try
       {