PAsswords save fix

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

@@ -1015,7 +1015,7 @@ public class DataSourceRegistry implements DBPDataSourceRegistry
                         curNetworkHandler.setEnabled(CommonUtils.getBoolean(atts.getValue(RegistryConstants.ATTR_ENABLED)));
                         curNetworkHandler.setUserName(CommonUtils.notEmpty(atts.getValue(RegistryConstants.ATTR_USER)));
                         curNetworkHandler.setSavePassword(CommonUtils.getBoolean(atts.getValue(RegistryConstants.ATTR_SAVE_PASSWORD)));
-                        if (!passwordReadCanceled) {
+                        if (!passwordReadCanceled && curNetworkHandler.isSavePassword()) {
                             curNetworkHandler.setPassword(readSecuredPassword(atts, curDataSource, "network/" + handlerId));
                         }
 

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/navigator/DBNDataSource.java

@@ -217,15 +217,22 @@ public class DBNDataSource extends DBNDatabaseNode implements IAdaptable
         String folderPath = dataSource.getFolderPath();
         for (DBNNode node : nodes) {
             if (node instanceof DBNDataSource) {
-                ((DBNDataSource) node).setFolderPath(folderPath);
+                if (!((DBNDataSource) node).setFolderPath(folderPath)) {
+                    return;
+                }
             }
         }
         DBNModel.updateConfigAndRefreshDatabases(this);
     }
 
-    public void setFolderPath(String folder)
+    public boolean setFolderPath(String folder)
     {
+        final String oldPath = dataSource.getFolderPath();
+        if (CommonUtils.equalObjects(oldPath, folder)) {
+            return false;
+        }
         dataSource.setFolderPath(folder);
+        return true;
     }
 
     public DBNNode refreshNode(DBRProgressMonitor monitor, Object source) throws DBException