From 730ded1f4c78c3b6c8930cd48edb36dbfc21a51d Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 15 Dec 2023 15:45:43 +0300
Subject: [PATCH] =?UTF-8?q?=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20=D1=81=D0=B1?=
 =?UTF-8?q?=D1=80=D0=BE=D1=81=20=D1=81=D0=BE=D0=B5=D0=B4=D0=B8=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F.=20=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20?=
 =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B0?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BA=20=D0=BD=D0=BE=D0=B2=D1=8B=D1=85=20=D0=BF?=
 =?UTF-8?q?=D0=B0=D0=BA=D0=B5=D1=82=D0=BE=D0=B2=20=D0=BF=D1=80=D0=B8=20?=
 =?UTF-8?q?=D0=B8=D1=85=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D0=B8?=
 =?UTF-8?q?=20=D1=81=20=D0=B1=D0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                          |  7 +++++-
 src/TestingSystem/Common/TestingPlanner.java |  9 ++++----
 src/TestingSystem/DVM/DVMTestingPlanner.java | 24 +++++++++++++-------
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c5759ea6..d6bc17f1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,7 +6,12 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="" />
+    <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
diff --git a/src/TestingSystem/Common/TestingPlanner.java b/src/TestingSystem/Common/TestingPlanner.java
index 04a913a6..e421936f 100644
--- a/src/TestingSystem/Common/TestingPlanner.java
+++ b/src/TestingSystem/Common/TestingPlanner.java
@@ -151,15 +151,16 @@ public abstract class TestingPlanner<P extends TestingPackage> {
                                     Kill();
                                     UpdatePackageState(TasksPackageState.Aborted);
                                     EmailPackage();
-                                } else
+                                } else {
                                     Session();
+
+                                }
                             }
                         } catch (Exception ex) {
-                            Print("Ошибка сеанса.");
+                            Print("Ошибка сеанса. Соединение будет разорвано.");
                             Print(ex.getMessage());
-                        } finally {
                             Disconnect();
-                        }
+                        } finally {}
                     }
                     //--
                     testingPackage.destructor();
diff --git a/src/TestingSystem/DVM/DVMTestingPlanner.java b/src/TestingSystem/DVM/DVMTestingPlanner.java
index e9707240..7c4d25d2 100644
--- a/src/TestingSystem/DVM/DVMTestingPlanner.java
+++ b/src/TestingSystem/DVM/DVMTestingPlanner.java
@@ -371,16 +371,24 @@ public class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
     }
     @Override
     protected boolean Connect() {
-        try {
-            user.connection = null;
-            user.connection = new UserConnection(machine, user);
-            Print("Соединение c " + machine.getURL() + " " + user.login + " успешно установлено.");
-        } catch (Exception ex) {
-            Print(ex.toString());
-            user.connection = null;
-            Print("Не удалось установить соединение.");
+        if (user.connection==null) {
+            try {
+                user.connection = new UserConnection(machine, user);
+                Print("Соединение c " + machine.getURL() + " " + user.login + " успешно установлено.");
+            } catch (Exception ex) {
+                Print(ex.toString());
+                user.connection = null;
+                Print("Не удалось установить соединение.");
+            }
         }
         return user.connection != null;
     }
+    @Override
+    protected void Disconnect() {
+        if (user.connection != null) {
+            user.connection.Disconnect();
+            user.connection = null;
+        }
+    }
     //--
 }