# HG changeset patch
# User Tim Englich <tim.englich@intevation.de>
# Date 1268729413 0
# Node ID cae93c7095484247403ef59e5a7ea1aa7bc6df85
# Parent  2dc0666db49a480686898fdcba67843c9d51a6dc
Fixed NPE using the Presettings-Object without given Presettings.

gnv-artifacts/trunk@781 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 2dc0666db49a -r cae93c709548 gnv-artifacts/ChangeLog
--- a/gnv-artifacts/ChangeLog	Mon Mar 15 17:01:42 2010 +0000
+++ b/gnv-artifacts/ChangeLog	Tue Mar 16 08:50:13 2010 +0000
@@ -1,3 +1,8 @@
+2010-03-16  Tim Englich  <tim.englich@intevation.de>
+
+	* src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java (fetchData): 
+	  BugFix: Fixed NPE using the Presettings-Object without given Presettings.
+
 2010-03-15  Tim Englich  <tim.englich@intevation.de>
 
 	* doc/conf/products/verticalprofile/conf_timeseriespoint.xml: 
diff -r 2dc0666db49a -r cae93c709548 gnv-artifacts/src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java	Mon Mar 15 17:01:42 2010 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java	Tue Mar 16 08:50:13 2010 +0000
@@ -178,7 +178,9 @@
                                                   geometryWKT};
                     }else{
                         //Look into the presetting for an WKT
-                        InputData geometryWKTData = this.preSettings.get("geometry");
+                        InputData geometryWKTData = this.preSettings != null ? 
+                                                    this.preSettings.get("geometry") :
+                                                    null ;
                         if (geometryWKTData != null){
                             queryValues = new String[]{columns,
                                                        table,
@@ -190,7 +192,9 @@
                     }
                 }else{
                     //Look into the presetting for an WKT
-                    InputData geometryWKTData = this.preSettings.get("geometry");
+                    InputData geometryWKTData = this.preSettings != null ? 
+                                                this.preSettings.get("geometry") :
+                                                null ;
                     if (geometryWKTData != null){
                         queryValues = new String[]{columns,
                                                    table,