This is an automated email from the git hooks/post-receive script. New commit to branch feature/8204 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 1b688874ee5f478e245dff4760439078e19a6d97 Author: Kevin Morin <morin@codelutin.com> Date: Mon Apr 4 16:24:32 2016 +0200 add or remove the sampling code even if the row should not be sampled according to the protocol (fixes #8204) --- .../fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java index c2a25e2..dd03eb7 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java @@ -390,8 +390,6 @@ public class CruiseSamplingCache implements Closeable { int operationSamplingNb = operationCache.incrementSamplingNb(operationKey); - addSamplingCode(species.getReferenceTaxonId(), samplingCode); - if (log.isInfoEnabled()) { log.info("add Sampling " + samplingKey + " => op " + operationSamplingNb + " / zone " + zoneSamplingNb + " / cruise " + totalSamplingNb); } @@ -399,6 +397,8 @@ public class CruiseSamplingCache implements Closeable { SamplingEvent event = new SamplingEvent(this, lengthStep, gender, maturity, cpsDefinition, optionalZone, totalSamplingNb, zoneSamplingNb, operationSamplingNb); fireResumeUpdated(event); } + + addSamplingCode(species.getReferenceTaxonId(), samplingCode); } /** @@ -593,8 +593,6 @@ public class CruiseSamplingCache implements Closeable { int operationSamplingNb = operationCache.decrementSamplingNb(operationKey); - removeSamplingCode(species.getReferenceTaxonId(), samplingCode); - if (log.isInfoEnabled()) { log.info("remove Sampling " + samplingKey + " => op " + operationSamplingNb + " / zone " + zoneSamplingNb + " / cruise " + totalSamplingNb); } @@ -602,6 +600,9 @@ public class CruiseSamplingCache implements Closeable { SamplingEvent event = new SamplingEvent(this, lengthStep, gender, maturity, cpsDefinition, optionalZone, totalSamplingNb, zoneSamplingNb, operationSamplingNb); fireResumeUpdated(event); } + + removeSamplingCode(species.getReferenceTaxonId(), samplingCode); + } /** -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.