From 4c1f460a7336190ab7f7ba86e7bfbddabdd18853 Mon Sep 17 00:00:00 2001
From: jurgen <serge-rider@users.noreply.github.com>
Date: Mon, 13 Oct 2014 08:02:15 +0000
Subject: [PATCH] PostgreSQL connection timeout added Test connection fix
 (double dispose)

---
 .../jkiss/dbeaver/ui/dialogs/connection/ConnectionWizard.java   | 2 --
 plugins/org.jkiss.dbeaver.generic/plugin.xml                    | 2 ++
 2 files changed, 2 insertions(+), 2 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 ff1b1a0a22..359a52ece7 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
@@ -189,8 +189,6 @@ public abstract class ConnectionWizard extends Wizard implements INewWizard {
                 monitor.subTask(CoreMessages.dialog_connection_wizard_start_connection_monitor_success);
             } catch (DBException ex) {
                 throw new InvocationTargetException(ex);
-            } finally {
-                testDataSource.dispose();
             }
         }
     }
diff --git a/plugins/org.jkiss.dbeaver.generic/plugin.xml b/plugins/org.jkiss.dbeaver.generic/plugin.xml
index 9d2ce1c6b0..7c46aebd93 100644
--- a/plugins/org.jkiss.dbeaver.generic/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.generic/plugin.xml
@@ -132,6 +132,8 @@
                     description="PostgreSQL standard driver">
                     <file type="jar" path="drivers/postgresql/postgresql-9.1-901.jdbc4.jar" url="*"/>
                     <file type="license" path="drivers/postgresql/LICENSE.txt" url="*"/>
+                    <property name="loginTimeout" value="10"/>
+
                     <parameter name="query-get-active-db" value="SHOW search_path"/>
                     <parameter name="query-set-active-db" value="SET search_path = ?"/>
                     <parameter name="active-entity-type" value="schema"/>
-- 
GitLab