This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 075015654e732d480a2991c3a4c01824464d30c3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 13:06:17 2016 +0200 on export les hits seulement si il y a eu des prélèvements (See #8157) --- .../service/sampling/CruiseSamplingInternalCache.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingInternalCache.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingInternalCache.java index 1ac750f..371d836 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingInternalCache.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingInternalCache.java @@ -198,7 +198,7 @@ class CruiseSamplingInternalCache implements Closeable { SamplingData samplingData = entry.getValue(); - if (!samplingData.isEmpty()) { + if (samplingData.withSampling()) { String[] keyTokens = entry.getKey().split(KEY_SEPARATOR); @@ -251,7 +251,7 @@ class CruiseSamplingInternalCache implements Closeable { } public int decrementObservationNb() { - Preconditions.checkState(observationNb > 0, "You cannot decrement the observation number if there is no observation"); + Preconditions.checkState(withObservation(), "You cannot decrement the observation number if there is no observation"); observationNb--; return getObservationNb(); } @@ -266,17 +266,21 @@ class CruiseSamplingInternalCache implements Closeable { } public int decrementSamplingNb() { - Preconditions.checkState(samplingNb > 0, "You cannot decrement a sampling number if there is no sampling"); + Preconditions.checkState(withSampling(), "You cannot decrement a sampling number if there is no sampling"); samplingNb--; return getSamplingNb(); } - public int getSamplingNb() { - return samplingNb; + public boolean withSampling() { + return samplingNb > 0; + } + + public boolean withObservation() { + return observationNb > 0; } - public boolean isEmpty() { - return samplingNb == 0 && observationNb == 0; + public int getSamplingNb() { + return samplingNb; } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.