Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 5971fd79 by tchemit at 2019-07-16T10:33:56Z update pom - - - - - cb723884 by tchemit at 2019-07-16T10:34:16Z [PS][CALCUL] Problèmes de calcul avec quelques marées (findLengthLengthParameter) - Closes #1350 - - - - - 2 changed files: - pom.xml - services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java Changes: ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.23</version> + <version>2019.8.24</version> </parent> <groupId>fr.ird.observe</groupId> ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java ===================================== @@ -692,6 +692,10 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements } SizeMeasureType outputSizeMeasureType = lengthWeightParameter.getSizeMeasureType(); + if (outputSizeMeasureType == null) { + log.error(String.format("No size measure type found for LengthWeightParameter (%s) will use the one of the species", lengthWeightParameter.getTopiaId())); + outputSizeMeasureType = lengthWeightParameter.getSpecies().getSizeMeasureType(); + } if (!Objects.equals(inputSizeMeasureType, outputSizeMeasureType)) { // on doit effectuer une conversion taille - taille avant de convertir en poids View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/ae2bfff91e79a423f67ce04e541... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/ae2bfff91e79a423f67ce04e541... You're receiving this email because of your account on gitlab.com.
participants (1)
-
Tony CHEMIT