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 c55a64c9d73cd0fe5b694720dc9fed9008aca7e7 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Tue Jun 28 16:08:15 2016 +0200 fixes #8367 (lengthStepInMm n'est pas calculé en Step) --- .../fr/ifremer/tutti/service/sampling/CruiseSamplingCache.java | 9 +++------ 1 file changed, 3 insertions(+), 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 5a5abb1..51bde24 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 @@ -39,7 +39,6 @@ import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation; import fr.ifremer.tutti.service.cruise.CruiseCacheAble; -import fr.ifremer.tutti.util.Numbers; import java.util.Collection; import java.util.HashMap; import java.util.List; @@ -774,11 +773,9 @@ public class CruiseSamplingCache implements CruiseCacheAble { Boolean maturity = getMaturity(individualObservationBatch); - // FIXME poussin 20160623 lengthStepInMm must be compute with next line (like bug 8304 and 8337 ?) - // int lengthStepInMm = individualObservationBatch.getLengthStepCaracteristic().getLengthStepInMm(lengthStep); - int lengthStepInMm = Numbers.convertToMm(lengthStep, individualObservationBatch.getLengthStepCaracteristic().getUnit()); -// log.error(String.format("DEBUG ###***### computed lengthStep %s but perhaps must be %s", -// lengthStepInMm, individualObservationBatch.getLengthStepCaracteristic().getLengthStepInMm(lengthStep))); + // lengthStepInMm must be compute and not lengthS converted in mm (like bug #8304 and #8337) + int lengthStepInMm = individualObservationBatch.getLengthStepCaracteristic().getLengthStepInMm(lengthStep); + // OLD: int lengthStepInMm = Numbers.convertToMm(lengthStep, individualObservationBatch.getLengthStepCaracteristic().getUnit()); CaracteristicQualitativeValue gender = individualObservationBatch.getCaracteristics().getQualitativeValue(sexCaracteristic); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.