[PATCH 8 of 9] Handle the case where the period panel is used in a state without start and end

Wald Commits scm-commit at wald.intevation.org
Thu Mar 26 12:12:02 CET 2015


# HG changeset patch
# User Andre Heinecke <andre.heinecke at intevation.de>
# Date 1427368063 -3600
# Node ID 97365575da6f87d06991bea2c5cbaa923a8d69f4
# Parent  a5439a609625a3e0b0b4c2b799b6e4f20826146c
Handle the case where the period panel is used in a state without start and end

diff -r a5439a609625 -r 97365575da6f gwt-client/src/main/java/org/dive4elements/river/client/client/ui/PeriodPanel.java
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/PeriodPanel.java	Thu Mar 26 12:06:47 2015 +0100
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/PeriodPanel.java	Thu Mar 26 12:07:43 2015 +0100
@@ -97,7 +97,8 @@
         /* Try to find default values for the periods */
         Data start = getData(data.getAll(), startName);
         Data end = getData(data.getAll(), endName);
-        if (start.getItems() == null || end.getItems() == null) {
+        if (start == null || end == null ||
+            start.getItems() == null || end.getItems() == null) {
             return layout;
         }
 


More information about the Dive4Elements-commits mailing list