# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1328891616 0
# Node ID 4e82bcd07550b8b6c449ce278a00cc0160f7df79
# Parent  8e2ae8813a063257d085d79603f93115ca22e514
Bugfix: Take care on empty ArtifactAndFacet objects in doAnnotations().

flys-artifacts/trunk@4038 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 8e2ae8813a06 -r 4e82bcd07550 flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Fri Feb 10 16:25:27 2012 +0000
+++ b/flys-artifacts/ChangeLog	Fri Feb 10 16:33:36 2012 +0000
@@ -1,3 +1,8 @@
+2012-02-10  Ingo Weinzierl <ingo@intevation.de>
+
+	* src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Bugfix: take
+	  care on empty ArtifactAndFacet objects in doAnnotations().
+
 2012-02-10  Sascha L. Teichmann	<sascha.teichmann@intevation.de>
 
 	* src/main/java/de/intevation/flys/exports/NormalizedReferenceCurveGenerator.java:
diff -r 8e2ae8813a06 -r 4e82bcd07550 flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java	Fri Feb 10 16:25:27 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java	Fri Feb 10 16:33:36 2012 +0000
@@ -987,6 +987,13 @@
         boolean visible
     ){
         logger.debug("doAnnotations");
+        if (aandf == null) {
+            logger.warn(
+                "Facet for Annotations is null. " +
+                "This should never happen!");
+            return;
+        }
+
         Facet facet = aandf.getFacet();
 
         // Add all annotations to our annotation pool.