From 39bd23987736217398c931694859bfc195b1f57e Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Thu, 1 Jun 2017 11:08:30 -0700
Subject: [PATCH] Making sure the model handles no observations without
 throwing an error

---
 .../PsilaRosaeObservationModel.java                  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 src/main/java/no/nibio/vips/model/psilarosaeobservationmodel/PsilaRosaeObservationModel.java

diff --git a/src/main/java/no/nibio/vips/model/psilarosaeobservationmodel/PsilaRosaeObservationModel.java b/src/main/java/no/nibio/vips/model/psilarosaeobservationmodel/PsilaRosaeObservationModel.java
old mode 100644
new mode 100755
index 7b5064f..189f0b3
--- a/src/main/java/no/nibio/vips/model/psilarosaeobservationmodel/PsilaRosaeObservationModel.java
+++ b/src/main/java/no/nibio/vips/model/psilarosaeobservationmodel/PsilaRosaeObservationModel.java
@@ -247,10 +247,6 @@ public class PsilaRosaeObservationModel  extends I18nImpl implements Model{
     public void setConfiguration(ModelConfiguration config) throws ConfigValidationException {
         this.getObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         this.pestObservations = this.getObjectMapper().convertValue(config.getConfigParameter("pestObservations"), new TypeReference<List<ObservationImpl>>(){});
-        if(this.pestObservations == null || this.pestObservations.isEmpty())
-        {
-            throw new ConfigValidationException("ERROR: No observations");
-        }
         Collections.sort(this.pestObservations);
         // Setting timezone
         this.timeZone = TimeZone.getTimeZone((String) config.getConfigParameter("timeZone"));
@@ -292,6 +288,10 @@ public class PsilaRosaeObservationModel  extends I18nImpl implements Model{
     }
     
     public Observation getObservationAtDate(Date currentDate) {
+        if(this.pestObservations == null || this.pestObservations.isEmpty())
+        {
+            return null;
+        }
         for(Observation obs:this.pestObservations)
         {
             if(this.weatherUtil.normalizeToExactDate(obs.getTimeOfObservation(), timeZone).compareTo(currentDate) == 0)
@@ -321,6 +321,10 @@ public class PsilaRosaeObservationModel  extends I18nImpl implements Model{
     }
     
     public Observation getObservationValidForDate(Date currentDate) {
+        if(this.pestObservations == null || this.pestObservations.isEmpty())
+        {
+            return null;
+        }
         Long currentTime = currentDate.getTime();
         Observation currentObservation = null;
         for(Observation obs:this.pestObservations)
-- 
GitLab