# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1328892161 0
# Node ID 0ddebd4448a7876ab0edca0412054112c6e57a74
# Parent  2c96222dd77390721fe582c46bcd2a4eee36d059
Picked rev4038 from trunk to stop Annotations break chart rendering.

flys-artifacts/tags/2.6@4039 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 2c96222dd773 -r 0ddebd4448a7 flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Fri Feb 10 14:07:03 2012 +0000
+++ b/flys-artifacts/ChangeLog	Fri Feb 10 16:42:41 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  Ingo Weinzierl <ingo@intevation.de>
 
 	* src/main/java/de/intevation/flys/exports/HistoricalDischargeCurveExporter.java:
diff -r 2c96222dd773 -r 0ddebd4448a7 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 14:07:03 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java	Fri Feb 10 16:42:41 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.