From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Fri, 11 Nov 2016 10:38:20 +0000 (+0200)
Subject: Sync git svn branch with SVN repository r33389.
X-Git-Tag: v1.25.0~53^2
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=d7afa23;p=simantics%2Fplatform.git

Sync git svn branch with SVN repository r33389.

refs #6726
---

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..7717f0448 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
diff --git a/bundles/org.simantics.tests.modelled/META-INF/MANIFEST.MF b/bundles/org.simantics.tests.modelled/META-INF/MANIFEST.MF
index bce9a42cf..c0b1ba43a 100644
--- a/bundles/org.simantics.tests.modelled/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.tests.modelled/META-INF/MANIFEST.MF
@@ -4,15 +4,10 @@ Bundle-Name: Simantics Modelled Tests
 Bundle-SymbolicName: org.simantics.tests.modelled
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.simantics.tests.modelled.Activator
-Require-Bundle: org.eclipse.core.runtime,
- org.simantics.db,
- org.simantics.db.common,
- org.simantics.tests.modelled.ontology,
+Require-Bundle: org.simantics.tests.modelled.ontology,
  org.simantics.scl.osgi,
  org.simantics,
- org.simantics.scl.compiler,
  org.junit,
- org.simantics.db.testing,
  org.simantics.modeling;bundle-version="1.1.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy