From 7ee2b8d61b308385027a1460bd60f451734d0d10 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Wed, 18 Apr 2018 14:33:21 +0200
Subject: [PATCH] Avoiding Exception on non-existing Organization
---
.../vips/logic/controller/session/PointOfInterestBean.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/main/java/no/nibio/vips/logic/controller/session/PointOfInterestBean.java b/src/main/java/no/nibio/vips/logic/controller/session/PointOfInterestBean.java
index 8f1534f6..c983c3fa 100755
--- a/src/main/java/no/nibio/vips/logic/controller/session/PointOfInterestBean.java
+++ b/src/main/java/no/nibio/vips/logic/controller/session/PointOfInterestBean.java
@@ -252,8 +252,14 @@ public class PointOfInterestBean {
* @return
*/
public List<PointOfInterestWeatherStation> getWeatherstationsForOrganization(Organization organization, Boolean active) {
+
+ if(organization == null)
+ {
+ return new ArrayList<>();
+ }
// Avoid nulls
active = active == null ? true : active;
+
List<PointOfInterestWeatherStation> retVal = em.createNamedQuery("PointOfInterestWeatherStation.findByActivityAndOrganizationId", PointOfInterestWeatherStation.class)
.setParameter("organizationId", organization)
.setParameter("active", active)
--
GitLab