Fixed possible deadlock in NXCSession.executeScript

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 9881f07..21934ae 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
@@ -5379,12 +5379,15 @@ public class NXCSession
       waitForRCC(msg.getMessageId());
       synchronized(handler)
       {
-         try
-         {
-            handler.wait();
-         }
-         catch(InterruptedException e)
+         if (!handler.isComplete())
          {
+            try
+            {
+               handler.wait();
+            }
+            catch(InterruptedException e)
+            {
+            }
          }
       }
       if (handler.isTimeout())