提交 4cb184d8 编写于 作者: S Serge Rider

Network profiles management fix

上级 380f22c7
...@@ -170,9 +170,6 @@ public class ConnectionPageNetworkHandler extends ConnectionWizardPage implement ...@@ -170,9 +170,6 @@ public class ConnectionPageNetworkHandler extends ConnectionWizardPage implement
handlerConfiguration = new DBWHandlerConfiguration(handlerDescriptor, dataSource.getDriver()); handlerConfiguration = new DBWHandlerConfiguration(handlerDescriptor, dataSource.getDriver());
} }
} else { } else {
if (oldProfileId == null) {
return;
}
cfg.setConfigProfile(null); cfg.setConfigProfile(null);
} }
site.firePropertyChange(this, PROP_CONFIG_PROFILE, oldProfileId, activeProfile == null ? null : activeProfile.getProfileName()); site.firePropertyChange(this, PROP_CONFIG_PROFILE, oldProfileId, activeProfile == null ? null : activeProfile.getProfileName());
......
...@@ -223,7 +223,7 @@ public class DataSourceRegistry implements DBPDataSourceRegistry { ...@@ -223,7 +223,7 @@ public class DataSourceRegistry implements DBPDataSourceRegistry {
synchronized (dataSources) { synchronized (dataSources) {
dsCopy = CommonUtils.copyList(dataSources); dsCopy = CommonUtils.copyList(dataSources);
} }
dsCopy.removeIf(ds -> CommonUtils.equalObjects(ds.getConnectionConfiguration().getUserProfileName(), profile.getProfileName())); dsCopy.removeIf(ds -> !CommonUtils.equalObjects(ds.getConnectionConfiguration().getUserProfileName(), profile.getProfileName()));
return dsCopy; return dsCopy;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册