From: Marko Luukkainen <marko.luukkainen@semantum.fi>
Date: Thu, 15 Aug 2019 09:17:35 +0000 (+0000)
Subject: Merge "Fix NPE in branch point synchronization"
X-Git-Tag: v1.43.0~222
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=17d6d3f9c1feaa9f3bd15e21fd22ad4bbf44a024;hp=1684fc4fa438d199c6ce78f32368cfe51e6f9262;p=simantics%2F3d.git

Merge "Fix NPE in branch point synchronization"
---

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/PipelineComponent.java b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/PipelineComponent.java
index 06944b53..f71dfed4 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/PipelineComponent.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/PipelineComponent.java
@@ -322,6 +322,8 @@ public abstract class PipelineComponent extends GeometryNode {
 			if (branch0 != null) {
 				if (branch0.getControlPoint() != null) {
 					PipeControlPoint branchPoint = getBranchPoint();
+					if (branchPoint == null)
+					    return false;
 					PipeControlPoint pcp = branch0.getControlPoint();
 					// TODO, relying that the other direction is connected.
 					boolean next = branch0.getPrevious() == this; // this --> branch0