Merge "Issue #2646 Fix Drawing layer NPE." into development

Former-commit-id: c8975c8b00feb8ab5dfa97d8f78bf54ab7290b90
This commit is contained in:
Nate Jensen 2014-01-17 10:50:38 -06:00 committed by Gerrit Code Review
commit f85f54d2ae

View file

@ -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.
*
* </pre>
*
@ -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,