From 3fed32b97c9faf314575ca5e9b7efde4480f0741 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Thu, 10 Jan 2019 09:47:42 +0100
Subject: [PATCH] Bugfix: Handling NULL collections in the leaf wetness
calculation algorithm
---
src/main/java/no/nibio/vips/util/WeatherUtil.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/no/nibio/vips/util/WeatherUtil.java b/src/main/java/no/nibio/vips/util/WeatherUtil.java
index 77dd981..12a17f0 100755
--- a/src/main/java/no/nibio/vips/util/WeatherUtil.java
+++ b/src/main/java/no/nibio/vips/util/WeatherUtil.java
@@ -492,12 +492,12 @@ public class WeatherUtil {
List<WeatherObservation> UM
) throws ConfigValidationException {
- Collections.sort(BT);
- Collections.sort(TM);
- Collections.sort(RR);
- Collections.sort(Q0);
- Collections.sort(FM2);
- Collections.sort(UM);
+ if(BT != null) Collections.sort(BT);
+ if(TM != null) Collections.sort(TM);
+ if(RR != null) Collections.sort(RR);
+ if(Q0 != null) Collections.sort(Q0);
+ if(FM2 != null) Collections.sort(FM2);
+ if(UM != null) Collections.sort(UM);
// If BT is same length as TM, return BT unmodified
--
GitLab