From 5cbe38aade51eba8118af19b8f7ee0d30b511b16 Mon Sep 17 00:00:00 2001 From: Ben Steffensmeier Date: Fri, 17 Jan 2014 10:41:28 -0600 Subject: [PATCH] Issue #2646 Fix Drawing layer NPE. Former-commit-id: 1e5f3e1375ec3d9485863b38e6926e95e7b3921e --- .../raytheon/uf/viz/drawing/DrawingToolLayer.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/cave/com.raytheon.uf.viz.drawing/src/com/raytheon/uf/viz/drawing/DrawingToolLayer.java b/cave/com.raytheon.uf.viz.drawing/src/com/raytheon/uf/viz/drawing/DrawingToolLayer.java index 09fee0c7e3..055b9dcc6a 100644 --- a/cave/com.raytheon.uf.viz.drawing/src/com/raytheon/uf/viz/drawing/DrawingToolLayer.java +++ b/cave/com.raytheon.uf.viz.drawing/src/com/raytheon/uf/viz/drawing/DrawingToolLayer.java @@ -60,9 +60,10 @@ import com.vividsolutions.jts.geom.TopologyException; * * SOFTWARE HISTORY * - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * May 23, 2012 mschenke Initial creation + * Date Ticket# Engineer Description + * ------------- -------- ----------- -------------------------- + * May 23, 2012 mschenke Initial creation + * May 23, 2012 2646 bsteffen Fix NPE in project. * * * @@ -656,8 +657,10 @@ public class DrawingToolLayer implements IRenderable { currentData.geometries = reprojectCollection( currentData.geometries, projectionMap, oldGridToNewGrid); - currentDrawingLine = JTS.transform(currentDrawingLine, - oldGridToNewGrid); + if (currentDrawingLine != null) { + currentDrawingLine = JTS.transform(currentDrawingLine, + oldGridToNewGrid); + } } } catch (Exception e) { UFStatus.getHandler().handle(Priority.PROBLEM,