branch feature/2246 updated (9f72d77 -> 883d892)
This is an automated email from the git hooks/post-receive script. New change to branch feature/2246 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 9f72d77 Ne pas autoriser de réimporter des meta sur les opérations et engins déjà existantes (See #2246) new 883d892 Ne pas pouvoir effectuer plusieurs imports du même type 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 883d89247f05706f7705b3d865dea461a9780ca1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue May 10 10:03:34 2016 +0200 Ne pas pouvoir effectuer plusieurs imports du même type Summary of changes: .../echobase/services/service/removedata/RemoveDataService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 feature/2246 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 883d89247f05706f7705b3d865dea461a9780ca1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue May 10 10:03:34 2016 +0200 Ne pas pouvoir effectuer plusieurs imports du même type --- .../echobase/services/service/removedata/RemoveDataService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/RemoveDataService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/RemoveDataService.java index 21b09f1..64dbf15 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/RemoveDataService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/RemoveDataService.java @@ -82,8 +82,10 @@ public class RemoveDataService extends EchoBaseServiceSupport { public int compare(ImportLog o1, ImportLog o2) { int result = o1.getVoyageId().compareTo(o2.getVoyageId()); if (result == 0) { - result = o1.getImportType().ordinal() - - o2.getImportType().ordinal(); + result = o1.getImportType().ordinal() - o2.getImportType().ordinal(); + } + if (result == 0) { + result = o1.getImportDate().compareTo(o2.getImportDate()); } return result; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm