From eac048f0f5d43a97e3aa32f3d4ed0f911e717d3f Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Mon, 4 Dec 2017 12:43:24 +0100
Subject: [PATCH] Bugfix: Make sure deletion of forecast summaries works also
when there are no active forecasts
---
.../logic/controller/session/ForecastBean.java | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java b/src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java
index fcc097d1..c56bd511 100755
--- a/src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java
+++ b/src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java
@@ -868,11 +868,19 @@ public class ForecastBean {
}
}
- // Delete all summaries from not active forecasts
- em.createNativeQuery("DELETE FROM forecast_summary "
- + "WHERE forecast_configuration_id NOT IN :activeForecastIds")
- .setParameter("activeForecastIds", activeForecastIds)
- .executeUpdate();
+
+ if(activeForecastIds != null && ! activeForecastIds.isEmpty())
+ {
+ // Delete all summaries from not active forecasts
+ em.createNativeQuery("DELETE FROM forecast_summary "
+ + "WHERE forecast_configuration_id NOT IN :activeForecastIds")
+ .setParameter("activeForecastIds", activeForecastIds)
+ .executeUpdate();
+ }
+ else
+ {
+ em.createNativeQuery("TRUNCATE forecast_summary").executeUpdate();
+ }
}
public List<ForecastConfiguration> getForecastConfigurationWithSummaries(List<Long> forecastConfigurationIds)
--
GitLab