From: Marko Luukkainen <marko.luukkainen@semantum.fi>
Date: Mon, 25 Feb 2019 10:00:23 +0000 (+0000)
Subject: Merge "Added null check after getPossibleType(STR.Component)" into release/1.35.1
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=a89de05edbb55e4ae23d71eb1d0aaa7556d7148b;hp=ef7d8d27dc2794217a2e87ac0e2f7715ddacf6ed;p=simantics%2Fplatform.git

Merge "Added null check after getPossibleType(STR.Component)" into release/1.35.1
---

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 e0b93837e..db2d5eae2 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
@@ -47,7 +47,7 @@ class ActualConnectionDescriptor extends AbstractVariableConnectionPointDescript
 			
     		StructuralResource2 STR = StructuralResource2.getInstance(graph);
     		Resource type = graph.getPossibleType(parameter.component, STR.Component);
-    		if(graph.syncRequest(new IsLeafType(type))) return null;
+    		if (type != null && graph.syncRequest(new IsLeafType(type))) return null;
 
 			return Functions.computeInterfacePaths(graph, parameter.getVariable(graph).getParent(graph));