Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 24bd9754 by Tony CHEMIT at 2017-06-11T23:37:44+02:00 Sur les opérations (synchro, ...) on ne récupère plus les informations de sécurité de la base locale (See #781) - - - - - 1 changed file: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigModel.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigModel.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigModel.java @@ -37,14 +37,14 @@ import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import java.beans.PropertyChangeListener; import java.io.File; import java.util.EnumSet; import java.util.Objects; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import static fr.ird.observe.application.swing.configuration.constants.DbMode.USE_LOCAL; import static fr.ird.observe.application.swing.configuration.constants.DbMode.USE_REMOTE; @@ -463,7 +463,7 @@ public class ConfigModel extends AdminActionModel { } } - protected void startIncomingSourceModel(AdminUI ui) { + protected void startIncomingSourceModel(AdminUI ui, final ObserveDataSourceInformation previousSourceInfo) { AdminUIModel uiModel = ui.getModel(); @@ -476,7 +476,6 @@ public class ConfigModel extends AdminActionModel { ObserveSwingDataSource previousSource = getPreviousSource(); ObserveDataSourceConfiguration previousSourceConfig = null; - ObserveDataSourceInformation previousSourceInfo = null; EnumSet<DbMode> authorizedModes = uiModel.getIncomingDataSourceMode(); EnumSet<DbMode> modes = EnumSet.noneOf(DbMode.class); @@ -508,7 +507,7 @@ public class ConfigModel extends AdminActionModel { try { previousSourceConfig = previousSource.getConfiguration().clone(); - previousSourceInfo = previousSource.getInformation(); +// previousSourceInfo = previousSource.getInformation(); } catch (CloneNotSupportedException e) { if (log.isErrorEnabled()) { log.error("con not clone previous data configuration", e); @@ -602,15 +601,17 @@ public class ConfigModel extends AdminActionModel { // avant le demarrage du wizard, on ferme toujours la source // en cours d'utilisation + ObserveDataSourceInformation previousSourceInformation = null; if (previousSource != null && previousSource.isOpen()) { + previousSourceInformation = previousSource.getInformation(); if (log.isDebugEnabled()) { log.debug("Close previous source " + previousSource.getLabel()); } doCloseSource(previousSource); } - startIncomingSourceModel(ui); + startIncomingSourceModel(ui, previousSourceInformation); startCentralSourceModel(ui); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/24bd975455e51257d7efc749b692... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/24bd975455e51257d7efc749b692... You're receiving this email because of your account on gitlab.com.