halfhp#26 Fixed an NPE issue when drawing null values with a PointLabeler.

halfhp · halfhp · commit 40baa0ed1cd1 · 2017-01-05T08:18:34.000-06:00
diff --git a/androidplot-core/src/main/java/com/androidplot/xy/LineAndPointRenderer.java b/androidplot-core/src/main/java/com/androidplot/xy/LineAndPointRenderer.java
@@ -246,16 +246,18 @@ protected void renderPoints(Canvas canvas, RectF plotArea, XYSeries series, int
             final PointLabeler pointLabeler = hasPointLabelFormatter ? formatter.getPointLabeler() : null;
             for(int i = iStart; i < iEnd; i++) {
                 PointF p = points.get(i);
+                if(p != null) {
 
-                // if vertexPaint is available, draw vertex:
-                if (vertexPaint != null) {
-                    canvas.drawPoint(p.x, p.y, vertexPaint);
-                }
+                    // if vertexPaint is available, draw vertex:
+                    if (vertexPaint != null) {
+                        canvas.drawPoint(p.x, p.y, vertexPaint);
+                    }
 
-                // if textPaint and pointLabeler are available, draw point's text label:
-                if (pointLabeler != null) {
-                    canvas.drawText(pointLabeler.getLabel(series, i),
-                            p.x + plf.hOffset, p.y + plf.vOffset, plf.getTextPaint());
+                    // if textPaint and pointLabeler are available, draw point's text label:
+                    if (pointLabeler != null) {
+                        canvas.drawText(pointLabeler.getLabel(series, i),
+                                p.x + plf.hOffset, p.y + plf.vOffset, plf.getTextPaint());
+                    }
                 }
             }
         }
