#1115 SSH tunnel password acquire fix

Former-commit-id: beed176c

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java

@@ -672,7 +672,7 @@ public class DataSourceDescriptor
                 monitor.subTask("Initialize tunnel");
                 tunnel = tunnelConfiguration.createHandler(DBWTunnel.class);
                 try {
-                    if (tunnel.needsPassword(tunnelConfiguration)) {
+                    if (!tunnelConfiguration.isSavePassword() && tunnel.needsPassword(tunnelConfiguration)) {
                         if (!DataSourceHandler.askForPassword(this, tunnelConfiguration)) {
                             DataSourceHandler.updateDataSourceObject(this);
                             tunnel = null;

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/net/SSHTunnelImpl.java

@@ -201,7 +201,7 @@ public class SSHTunnelImpl implements DBWTunnel {
         if (sshAuthType != null) {
             authType = SSHConstants.AuthType.valueOf(sshAuthType);
         }
-        return authType == SSHConstants.AuthType.PASSWORD && !configuration.isSavePassword();
+        return authType == SSHConstants.AuthType.PASSWORD;
     }
 
     @Override