This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit c54d6de97d2561cfd2795c9726a2592f1f1ecd47 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 18 08:16:51 2015 +0100 Amélioration du test de vérification du poids à zéro (See #7720) --- tutti-persistence/src/main/java/fr/ifremer/tutti/util/Weights.java | 4 ++-- .../fr/ifremer/tutti/service/catches/WeightComputingService.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Weights.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Weights.java index 52ebf8f..bc9378f 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Weights.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Weights.java @@ -132,7 +132,7 @@ public class Weights { return compareWeights(v0, v1) != 0; } - public static boolean isZero(Float weight) { - return compareRawWeights(weight, 0.0f) == 0; + public static boolean isNullOrZero(Float weight) { + return weight == null || compareRawWeights(weight, 0.0f) == 0; } } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java index 57c0d21..5c8bab4 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java @@ -453,7 +453,7 @@ public class WeightComputingService extends AbstractTuttiService { result = categoryWeight; } } - if (result == null || Weights.isZero(result)) { + if (Weights.isNullOrZero(result)) { String categoryLabel = getCategoryLabel(batch.getSampleCategoryId()); @@ -644,7 +644,7 @@ public class WeightComputingService extends AbstractTuttiService { result = categoryWeight; } } - if (result == null || Weights.isZero(result)) { + if (Weights.isNullOrZero(result)) { String categoryLabel = getCategoryLabel(batch.getSampleCategoryId()); @@ -674,7 +674,7 @@ public class WeightComputingService extends AbstractTuttiService { for (int i = 0; i < children.size(); i++) { MarineLitterBatch batch = children.get(i); - if (checkWeight && (batch.getWeight() == null || Weights.isZero(batch.getWeight()))) { + if (checkWeight && Weights.isNullOrZero(batch.getWeight())) { throw new TuttiWeightComputingException( t("tutti.validator.warning.marineLitter.weight.required"), MarineLitterBatch.PROPERTY_WEIGHT, -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.