changeset 560:5274b9317e40

#139 Fixed NPE while initialising user defined values in the adapted wq panel. flys-client/trunk@2092 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Thu, 09 Jun 2011 06:05:44 +0000
parents ec85bab86e7b
children 460b8e0f0563
files flys-client/ChangeLog flys-client/src/main/java/de/intevation/flys/client/client/ui/WQAdaptedInputPanel.java
diffstat 2 files changed, 12 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/flys-client/ChangeLog	Wed Jun 08 14:49:47 2011 +0000
+++ b/flys-client/ChangeLog	Thu Jun 09 06:05:44 2011 +0000
@@ -1,3 +1,10 @@
+2011-06-09  Ingo Weinzierl <ingo@intevation.de>
+
+	  flys/issue139 (WINFO: NPE bei Step-Back bei ungleichwertiger Berechnungsart)
+
+	* src/main/java/de/intevation/flys/client/client/ui/WQAdaptedInputPanel.java:
+	  Fixed NPE while initialising user values.
+
 2011-06-08  Ingo Weinzierl <ingo@intevation.de>
 
 	  flys/issue103 PART 2 (WINFO: Wasserspiegellagenberechnung / Layout-Inkonsistenz)
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/WQAdaptedInputPanel.java	Wed Jun 08 14:49:47 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/WQAdaptedInputPanel.java	Thu Jun 09 06:05:44 2011 +0000
@@ -253,6 +253,11 @@
 
             String           key = cols[0] + GAUGE_PART_SEPARATOR + cols[1];
             DoubleArrayPanel dap = wqranges.get(key);
+
+            if (dap == null) {
+                continue;
+            }
+
             dap.setValues(values);
         }
     }

http://dive4elements.wald.intevation.org