This is an automated email from the git hooks/post-receive script. New commit to branch feature/8177 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 3be764dd2ea8cf0764d90c6454f151db5732c4b9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 31 16:43:43 2016 +0200 fix merge --- .../fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java | 7 +------ 1 file changed, 1 insertion(+), 6 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 a64becc..93eb2ba 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 @@ -1,4 +1,4 @@ -package fr.ifremer.tutti.service.samplingCache; +package fr.ifremer.tutti.service.sampling; /* * #%L @@ -686,11 +686,6 @@ public class CruiseSamplingCache implements Closeable { SamplingListener[] samplingListeners = listeners.getListeners(SamplingListener.class); if (samplingListeners.length > 0) { - int nbForCruise = getSamplingNumber(totalValue, samplingInterval); - int nbForZone = getSamplingNumber(zoneValue, samplingInterval); - int nbForOperation = getSamplingNumber(operationValue, samplingInterval); - - SamplingEvent event = new SamplingEvent(this, lengthStep, gender, maturity, cpsDefinition, nbForCruise, nbForZone, nbForOperation); for (SamplingListener listener : samplingListeners) { listener.resumeUpdated(event); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.