From 8caa69c45c8839cc0cbb4c665d24e694417d7b74 Mon Sep 17 00:00:00 2001
From: jurgen <serge-rider@users.noreply.github.com>
Date: Wed, 12 Aug 2015 13:53:35 +0000
Subject: [PATCH] Connection test cancel implemented

---
 .../ui/dialogs/connection/ConnectionWizard.java      | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionWizard.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionWizard.java
index 07b4a1b73c..e6e9bcae12 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionWizard.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionWizard.java
@@ -42,6 +42,7 @@ import org.jkiss.dbeaver.registry.DataSourceRegistry;
 import org.jkiss.dbeaver.registry.DriverDescriptor;
 import org.jkiss.dbeaver.runtime.DefaultProgressMonitor;
 import org.jkiss.dbeaver.runtime.jobs.ConnectJob;
+import org.jkiss.dbeaver.runtime.jobs.DisconnectJob;
 import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.dbeaver.utils.GeneralUtils;
 import org.jkiss.utils.CommonUtils;
@@ -251,19 +252,12 @@ public abstract class ConnectionWizard extends Wizard implements INewWizard {
                         session.close();
                     }
                 }
-                try {
-                    monitor.subTask(CoreMessages.dialog_connection_wizard_start_connection_monitor_close);
-                    container.disconnect(monitor, false);
-                } catch (DBException e) {
-                    // ignore it
-                    log.error(e);
-                } finally {
-                    monitor.done();
-                }
+                new DisconnectJob(container).schedule();
                 monitor.subTask(CoreMessages.dialog_connection_wizard_start_connection_monitor_success);
             } catch (DBException ex) {
                 connectError = ex;
             }
+            monitor.done();
             return Status.OK_STATUS;
         }
     }
-- 
GitLab