Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
2 changed files:
- pom.xml
- services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java
Changes:
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 |
<parent>
|
| 27 | 27 |
<groupId>io.ultreia.maven</groupId>
|
| 28 | 28 |
<artifactId>pom</artifactId>
|
| 29 |
- <version>2019.8.23</version>
|
|
| 29 |
+ <version>2019.8.24</version>
|
|
| 30 | 30 |
</parent>
|
| 31 | 31 |
|
| 32 | 32 |
<groupId>fr.ird.observe</groupId>
|
| ... | ... | @@ -692,6 +692,10 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements |
| 692 | 692 |
}
|
| 693 | 693 |
|
| 694 | 694 |
SizeMeasureType outputSizeMeasureType = lengthWeightParameter.getSizeMeasureType();
|
| 695 |
+ if (outputSizeMeasureType == null) {
|
|
| 696 |
+ log.error(String.format("No size measure type found for LengthWeightParameter (%s) will use the one of the species", lengthWeightParameter.getTopiaId()));
|
|
| 697 |
+ outputSizeMeasureType = lengthWeightParameter.getSpecies().getSizeMeasureType();
|
|
| 698 |
+ }
|
|
| 695 | 699 |
if (!Objects.equals(inputSizeMeasureType, outputSizeMeasureType)) {
|
| 696 | 700 |
|
| 697 | 701 |
// on doit effectuer une conversion taille - taille avant de convertir en poids
|