# HG changeset patch # User Felix Wolfsteller # Date 1323859716 0 # Node ID ddb7b7da6199de6f1adb8d89281e4e37c1c30b35 # Parent 8afd6a9bb244b11bc14cf605300261ccdd6078d6 Fix/survive certain minor malconditions. flys-artifacts/trunk@3413 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 8afd6a9bb244 -r ddb7b7da6199 flys-artifacts/ChangeLog --- a/flys-artifacts/ChangeLog Wed Dec 14 10:46:39 2011 +0000 +++ b/flys-artifacts/ChangeLog Wed Dec 14 10:48:36 2011 +0000 @@ -1,3 +1,13 @@ +2011-12-14 Felix Wolfsteller + + Fix/Guard certain misconditions. + + * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Do + not crash when given null-range. + + * src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java: + Do not crash when given malformed array. + 2011-12-14 Felix Wolfsteller Cosmetics. diff -r 8afd6a9bb244 -r ddb7b7da6199 flys-artifacts/src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java Wed Dec 14 10:46:39 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java Wed Dec 14 10:48:36 2011 +0000 @@ -30,7 +30,7 @@ * to 2nd dim. */ public static void addPoints(XYSeries series, double[][] points) { - if (points == null || points.length == 0) { + if (points == null || points.length <= 1) { return; } double [] xPoints = points[0]; diff -r 8afd6a9bb244 -r ddb7b7da6199 flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java Wed Dec 14 10:46:39 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java Wed Dec 14 10:48:36 2011 +0000 @@ -425,9 +425,10 @@ /** * Expands a given range if it collapses into one point. + * @param Range to be expanded if upper == lower bound. */ private Range expandPointRange(Range range) { - if (range.getLowerBound() == range.getUpperBound()) { + if (range != null && range.getLowerBound() == range.getUpperBound()) { return expandRange(range, 5); } return range;