From: Hannu Niemistö <hannu.niemisto@semantum.fi>
Date: Wed, 24 May 2017 12:20:58 +0000 (+0300)
Subject: Added null check to StreamingTransferableGraphImportProcess
X-Git-Tag: v1.29.0~33
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=4b7c3f8eacf1e6e018d38f5b984c0ccd53919b58

Added null check to StreamingTransferableGraphImportProcess

refs #7240
Change-Id: I5724ddfff4eae6c17dcd92eff71e25fb80bc8cf6
---

diff --git a/bundles/org.simantics.graph.db/src/org/simantics/graph/db/StreamingTransferableGraphImportProcess.java b/bundles/org.simantics.graph.db/src/org/simantics/graph/db/StreamingTransferableGraphImportProcess.java
index 754ae6123..78c369f96 100644
--- a/bundles/org.simantics.graph.db/src/org/simantics/graph/db/StreamingTransferableGraphImportProcess.java
+++ b/bundles/org.simantics.graph.db/src/org/simantics/graph/db/StreamingTransferableGraphImportProcess.java
@@ -289,7 +289,7 @@ public class StreamingTransferableGraphImportProcess implements TransferableGrap
 		ClusteringSupport support = graph.getService(ClusteringSupport.class);
 		if(id == Extensions.ROOT_LIBRARY_CLUSTER_SET || id == Extensions.INDEX_ROOT_CLUSTER_SET) return;
 		Resource indexRootClusterSetResource = rootLibrary;
-		if(support.isClusterSet(indexRoot)) {
+		if(indexRoot != null && support.isClusterSet(indexRoot)) {
 			indexRootClusterSetResource = indexRoot;
 		} else {
 			graph.setClusterSet4NewResource(rootLibrary);