branch develop-5.x updated (5176136 -> f5f199b)
This is an automated email from the git hooks/post-receive script. New change to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 5176136 Forcer l'utilisation de localhost pour le serveur web H2 (Fixes #8765) new f5f199b Problèmes lors de la synchro du référentiel de bases locales (Fixes #8853) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit f5f199b2ae986c5b95857dc21abe659d0aef421e Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Dec 8 13:33:21 2016 +0100 Problèmes lors de la synchro du référentiel de bases locales (Fixes #8853) Summary of changes: .../UnidirectionalReferentialSynchronizeEngine.java | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit f5f199b2ae986c5b95857dc21abe659d0aef421e Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Dec 8 13:33:21 2016 +0100 Problèmes lors de la synchro du référentiel de bases locales (Fixes #8853) --- .../UnidirectionalReferentialSynchronizeEngine.java | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java index 76ab447..b6d7fb7 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.service.actions.synchro.referential.legacy; import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.referential.ReferentialHelper; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffState; @@ -62,14 +63,15 @@ public class UnidirectionalReferentialSynchronizeEngine { // Première étape pour construire les builder de requète et calculer au passage les ids à faire remplacer // par l'utilisateur - for (Class<? extends ReferentialDto> referentialName : synchronizeDiffs.getReferentialNames()) { - - UnidirectionalReferentialSynchronizeRequest.Builder<?> builder = computeReferentialSynchronizeRequestBuilder( - localService, - referentialName, synchronizeDiffs, callbackRequests); - - referentialSynchronizeRequestBuilders.add(builder); + ImmutableSet<Class<? extends ReferentialDto>> referentialNames = synchronizeDiffs.getReferentialNames(); + for (Class<? extends ReferentialDto> referentialName : ReferentialHelper.REFERENCE_DTOS) { + if (referentialNames.contains(referentialName)) { + UnidirectionalReferentialSynchronizeRequest.Builder<?> builder = computeReferentialSynchronizeRequestBuilder( + localService, + referentialName, synchronizeDiffs, callbackRequests); + referentialSynchronizeRequestBuilders.add(builder); + } } return new UnidirectionalReferentialSynchronizeContext( @@ -79,7 +81,7 @@ public class UnidirectionalReferentialSynchronizeEngine { } - public UnidirectionalReferentialSynchronizeResult prepareResult(UnidirectionalReferentialSynchronizeLocalService localService,UnidirectionalReferentialSynchronizeContext context, UnidirectionalReferentialSynchronizeCallbackResults callbackResults) { + public UnidirectionalReferentialSynchronizeResult prepareResult(UnidirectionalReferentialSynchronizeLocalService localService, UnidirectionalReferentialSynchronizeContext context, UnidirectionalReferentialSynchronizeCallbackResults callbackResults) { UnidirectionalReferentialSynchronizeResult result = new UnidirectionalReferentialSynchronizeResult(); @@ -120,7 +122,8 @@ public class UnidirectionalReferentialSynchronizeEngine { if (sqlStatement.startsWith("INSERT")) { insertSqlRequests.add(sqlStatement); - }if (sqlStatement.startsWith("UPDATE")) { + } + if (sqlStatement.startsWith("UPDATE")) { updateSqlRequests.add(sqlStatement); } else { deleteSqlRequests.add(sqlStatement); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm