Connection test cancel implemented

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/jobs/ConnectJob.java

@@ -36,7 +36,8 @@ public class ConnectJob extends EventProcessorJob
 {
     private volatile Thread connectThread;
     private boolean reflect = true;
-    private IStatus connectStatus;
+    protected Throwable connectError;
+    protected IStatus connectStatus;
 
     public ConnectJob(
         DataSourceDescriptor container)
@@ -49,6 +50,10 @@ public class ConnectJob extends EventProcessorJob
         return connectStatus;
     }
 
+    public Throwable getConnectError() {
+        return connectError;
+    }
+
     @Override
     protected IStatus run(DBRProgressMonitor monitor)
     {
@@ -75,6 +80,7 @@ public class ConnectJob extends EventProcessorJob
             connectStatus = Status.OK_STATUS;
         }
         catch (Throwable ex) {
+            connectError = ex;
             connectStatus = GeneralUtils.makeExceptionStatus(ex);
         }
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionWizard.java

@@ -137,8 +137,8 @@ public abstract class ConnectionWizard extends Wizard implements INewWizard {
                                 break;
                             }
                         }
-                        if (op.error != null) {
-                            throw new InvocationTargetException(op.error);
+                        if (op.getConnectError() != null) {
+                            throw new InvocationTargetException(op.getConnectError());
                         }
                     }
                 });
@@ -186,7 +186,6 @@ public abstract class ConnectionWizard extends Wizard implements INewWizard {
         long startTime = -1;
         long connectTime = -1;
         DBRProgressMonitor ownerMonitor;
-        DBException error;
 
         public ConnectionTester(DataSourceDescriptor testDataSource)
         {
@@ -212,7 +211,7 @@ public abstract class ConnectionWizard extends Wizard implements INewWizard {
                 startTime = System.currentTimeMillis();
                 super.run(monitor);
                 connectTime = (System.currentTimeMillis() - startTime);
-                if (monitor.isCanceled()) {
+                if (connectError != null || monitor.isCanceled()) {
                     return Status.OK_STATUS;
                 }
 
@@ -263,7 +262,7 @@ public abstract class ConnectionWizard extends Wizard implements INewWizard {
                 }
                 monitor.subTask(CoreMessages.dialog_connection_wizard_start_connection_monitor_success);
             } catch (DBException ex) {
-                error = ex;
+                connectError = ex;
             }
             return Status.OK_STATUS;
         }