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 820b1e595958c36fb6fef8f99c12879b6f3d4981 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 22 16:41:41 2016 +0200 il se peut que ni la taille, ni le poids n'ai changé --- .../frequency/IndividualObservationToFrequencyEngine.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationToFrequencyEngine.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationToFrequencyEngine.java index f1993d3..c488833 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationToFrequencyEngine.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationToFrequencyEngine.java @@ -1,7 +1,6 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency; import com.google.common.base.MoreObjects; -import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.data.CopyIndividualObservationMode; import fr.ifremer.tutti.type.WeightUnit; import org.apache.commons.lang3.tuple.Pair; @@ -187,7 +186,12 @@ public class IndividualObservationToFrequencyEngine { Float oldWeight = oldState.getWeight(); boolean weightChanged = !Objects.equals(oldWeight, newWeight); - Preconditions.checkState(sizeChanged || weightChanged); + if (!sizeChanged && !weightChanged) { + + // ce cas limite peut arrive quand on passe de null à null + return null; + + } boolean oldStateValid = oldState.isValid(); boolean newStateValid = newState.isValid(); @@ -264,5 +268,4 @@ public class IndividualObservationToFrequencyEngine { } - } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.