From 682853a61dcb8132c1bcb91a21466b383a6bbc84 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Mon, 19 Jun 2017 09:29:50 -0700
Subject: [PATCH] Bugfix avoiding concurrentmodificationexception
---
.../oatfloweringmodel/OatFloweringModel.java | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
mode change 100644 => 100755 src/main/java/no/nibio/vips/model/oatfloweringmodel/OatFloweringModel.java
diff --git a/src/main/java/no/nibio/vips/model/oatfloweringmodel/OatFloweringModel.java b/src/main/java/no/nibio/vips/model/oatfloweringmodel/OatFloweringModel.java
old mode 100644
new mode 100755
index ccf3c37..32b82d6
--- a/src/main/java/no/nibio/vips/model/oatfloweringmodel/OatFloweringModel.java
+++ b/src/main/java/no/nibio/vips/model/oatfloweringmodel/OatFloweringModel.java
@@ -207,6 +207,15 @@ public class OatFloweringModel extends I18nImpl implements Model{
ObjectMapper mapper = new ObjectMapper();
List<WeatherObservation> observations = mapper.convertValue(config.getConfigParameter("observations"), new TypeReference<List<WeatherObservation>>(){});
+
+ // Must be complete set of daily mean temperatures
+ WeatherUtil wUtil = new WeatherUtil();
+ Date potentialHole = wUtil.findFirstHoleInObservationSeries(observations, WeatherObservation.LOG_INTERVAL_ID_1D, OatFloweringModel.DEFAULT_TIME_ZONE);
+ if(potentialHole != null)
+ {
+ throw new ConfigValidationException("Hole found in temperature series at = " + potentialHole);
+ }
+
for(WeatherObservation o:observations)
{
switch(o.getElementMeasurementTypeId())
@@ -221,17 +230,9 @@ public class OatFloweringModel extends I18nImpl implements Model{
// TODO: Throw validation error?
break;
}
-
- // Must be complete set of daily mean temperatures
- WeatherUtil wUtil = new WeatherUtil();
- Date potentialHole = wUtil.findFirstHoleInObservationSeries(observations, WeatherObservation.LOG_INTERVAL_ID_1D, OatFloweringModel.DEFAULT_TIME_ZONE);
- if(potentialHole != null)
- {
- throw new ConfigValidationException("Hole found in temperature series at = " + potentialHole);
- }
-
}
+
if(config.getConfigParameter("dateOfSowing") != null)
{
this.dateOfSowing = mapper.convertValue(config.getConfigParameter("dateOfSowing"), new TypeReference<Date>(){});
--
GitLab