Mercurial > dive4elements > river
changeset 2332:0ddebd4448a7
Picked rev4038 from trunk to stop Annotations break chart rendering.
flys-artifacts/tags/2.6@4039 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Fri, 10 Feb 2012 16:42:41 +0000 |
| parents | 2c96222dd773 |
| children | 66946e278e66 |
| files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java |
| diffstat | 2 files changed, 12 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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:
--- 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.