From 6f0b7f7299f898b693ab39ac2a2ea96e28e3e753 Mon Sep 17 00:00:00 2001
From: Evgeny Fradkin <Eugene.Fradkin@gmail.com>
Date: Fri, 19 Jan 2018 18:42:05 +0300
Subject: [PATCH] #2213 Tunnel initialization is fixed

---
 .../src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
index 6706714e38..62606bdc70 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
@@ -712,6 +712,7 @@ public class DataSourceDescriptor
 */
 
                     if (preferenceStore.getBoolean(ModelPreferences.CONNECT_USE_ENV_VARS)) {
+                        tunnelConfiguration = new DBWHandlerConfiguration(tunnelConfiguration);
                         tunnelConfiguration.resolveSystemEnvironmentVariables();
                     }
                     tunnelConnectionInfo = tunnel.initializeTunnel(monitor, registry.getPlatform(), tunnelConfiguration, connectionInfo);
-- 
GitLab