From 3b0c62d928e17ba936257cee0566b02b29c0354a Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Tue, 1 Aug 2017 12:36:19 +0200
Subject: [PATCH] Handling observations without observation data
---
.../DeliaRadicumFloralisObservationModel.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/no/nibio/vips/model/deliaradicumfloralisobservationmodel/DeliaRadicumFloralisObservationModel.java b/src/main/java/no/nibio/vips/model/deliaradicumfloralisobservationmodel/DeliaRadicumFloralisObservationModel.java
index 9220d56..9939fb5 100755
--- a/src/main/java/no/nibio/vips/model/deliaradicumfloralisobservationmodel/DeliaRadicumFloralisObservationModel.java
+++ b/src/main/java/no/nibio/vips/model/deliaradicumfloralisobservationmodel/DeliaRadicumFloralisObservationModel.java
@@ -339,15 +339,15 @@ public class DeliaRadicumFloralisObservationModel extends I18nImpl implements Mo
{
try
{
- Map<String, Double> data = this.getObjectMapper().readValue(new ByteArrayInputStream(observationData.getBytes("UTF-8")), new TypeReference<HashMap<String,Double>>() {});
- Double sum = 0.0;
- for(String key:data.keySet())
- {
- sum += data.get(key);
- }
- return sum/data.size();
+ Map<String, Double> data = this.getObjectMapper().readValue(new ByteArrayInputStream(observationData.getBytes("UTF-8")), new TypeReference<HashMap<String,Double>>() {});
+ Double sum = 0.0;
+ for(String key:data.keySet())
+ {
+ sum += data.get(key);
+ }
+ return sum/data.size();
}
- catch(IOException ex)
+ catch(IOException | NullPointerException ex)
{
return 0.0;
}
--
GitLab