X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.db.layer0%2Fsrc%2Forg%2Fsimantics%2Fdb%2Flayer0%2Fadapter%2Fimpl%2FEntityInstances.java;h=32a7d2a9f5b327edfe63a19ebd7b1045f28bfaef;hp=428b96a5db558a8faa9a28b29b867c60d84e93f2;hb=1956b6ed85e1df65c4df58e6cb0ac6aa296e6939;hpb=55ca14c4198659b908aeffc8d16e240b35a75e66

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/adapter/impl/EntityInstances.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/adapter/impl/EntityInstances.java
index 428b96a5d..32a7d2a9f 100644
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/adapter/impl/EntityInstances.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/adapter/impl/EntityInstances.java
@@ -174,8 +174,10 @@ public class EntityInstances implements Instances {
     public Collection<Resource> find(ReadGraph graph, Resource index, String filter) throws DatabaseException {
     	CollectionSupport coll = graph.getService(CollectionSupport.class);
     	
-    	List<Resource> rec = findRec(graph, index, filter, new THashSet<Resource>());
+    	THashSet<Resource> visited = new THashSet<>();
+    	List<Resource> rec = findRec(graph, index, filter, visited);
     	for(Resource global : Layer0Utils.listGlobalOntologies(graph)) {
+        	if(!visited.add(global)) continue;
     		List<Resource> rs = graph.syncRequest(new QueryIndex(global, type, filter), TransientCacheListener.<List<Resource>>instance());
     		if(rec.isEmpty() && !rs.isEmpty()) {
     			// TODO: rec could be an immutable empty list