This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 4049934ebad9f1606f5f6399843d197e92f0c7c4 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 d911443..01608b4 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>.