1 files changed, 5 insertions, 4 deletions
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/AUTConnection.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/AUTConnection.java
index e48e73835..85aab93ff 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/AUTConnection.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/communication/AUTConnection.java
@@ -163,12 +163,13 @@ public class AUTConnection extends BaseConnection {
      * badly which will be corrected in a future version!
      */
     public synchronized void reset() {
-        if (getCommunicator() != null) {
-            getCommunicator().clearListeners();
+        Communicator communicator = getCommunicator();
+        if (communicator != null) {
+            communicator.interruptAllTimeouts();
+            communicator.clearListeners();
+            communicator.close();
         }
 
-        getCommunicator().close();
-
         instance = null;
     }