From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Fri, 14 Sep 2018 12:34:14 +0000 (+0000)
Subject: Merge "Added null check after getPossibleType(STR.Component)"
X-Git-Tag: v1.43.0~136^2~375
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=fa0b5e5d3c4561af251471c5a5e0511f3ca65a16;hp=2b9f0288f5cba92ea1584e3d84e8d919f1277230

Merge "Added null check after getPossibleType(STR.Component)"
---

diff --git a/bundles/org.simantics.structural2/src/org/simantics/structural2/variables/ActualConnectionDescriptor.java b/bundles/org.simantics.structural2/src/org/simantics/structural2/variables/ActualConnectionDescriptor.java
index 716d4a001..f79bdb0b5 100644
--- a/bundles/org.simantics.structural2/src/org/simantics/structural2/variables/ActualConnectionDescriptor.java
+++ b/bundles/org.simantics.structural2/src/org/simantics/structural2/variables/ActualConnectionDescriptor.java
@@ -94,7 +94,7 @@ class ActualConnectionDescriptor extends AbstractVariableConnectionPointDescript
 		
 		StructuralResource2 STR = StructuralResource2.getInstance(graph);
 		Resource type = graph.getPossibleType(component, STR.Component);
-		return graph.syncRequest(new IsLeafType(type));
+		return type != null ? graph.syncRequest(new IsLeafType(type)) : false;
 		
 	}