This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit d62adad5f29af124033e7e0ba9864fa3e0a02225 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 23 21:53:11 2014 +0200 fixes #5658: [CAPTURE] Perte du deuxième lot lors d'une catégorisation --- .../tutti/persistence/service/util/BatchPersistenceHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchPersistenceHelper.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchPersistenceHelper.java index 1f8e9b5..623393d 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchPersistenceHelper.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchPersistenceHelper.java @@ -503,7 +503,7 @@ public class BatchPersistenceHelper extends AbstractPersistenceService { if (target.getRankOrder() == null) { // Start rank order at 1 short rankOrder = (short) 1; - if (source.getParentBatch() != null && source.getParentBatch().getChildBatchs() != null) { + if (source.getParentBatch() != null && CollectionUtils.isNotEmpty(source.getParentBatch().getChildBatchs())) { int maxRankOrder = 0; for (SpeciesAbleBatch batch : source.getParentBatch().getChildBatchs()) { Integer r = batch.getRankOrder(); @@ -513,7 +513,7 @@ public class BatchPersistenceHelper extends AbstractPersistenceService { } rankOrder += (short) maxRankOrder; - } else if (target.getParentBatch() != null && target.getParentBatch().getChildBatchs() != null) { + } else if (target.getParentBatch() != null && CollectionUtils.isNotEmpty(target.getParentBatch().getChildBatchs())) { short maxRankOrder = 0; for (Batch batch : target.getParentBatch().getChildBatchs()) { Short r = batch.getRankOrder(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.