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 428b96a5db558a8faa9a28b29b867c60d84e93f2..7717f04483de9be3e55953be82c6f4f8189328be 100644 (file)
--- 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 {\r
        CollectionSupport coll = graph.getService(CollectionSupport.class);\r
        \r
     public Collection<Resource> find(ReadGraph graph, Resource index, String filter) throws DatabaseException {\r
        CollectionSupport coll = graph.getService(CollectionSupport.class);\r
        \r

-       List<Resource> rec = findRec(graph, index, filter, new THashSet<Resource>());\r
+       THashSet<Resource> visited = new THashSet<>();\r
+       List<Resource> rec = findRec(graph, index, filter, visited);\r

        for(Resource global : Layer0Utils.listGlobalOntologies(graph)) {\r
        for(Resource global : Layer0Utils.listGlobalOntologies(graph)) {\r

+               if (!visited.add(global)) continue;\r

                List<Resource> rs = graph.syncRequest(new QueryIndex(global, type, filter), TransientCacheListener.<List<Resource>>instance());\r
                if(rec.isEmpty() && !rs.isEmpty()) {\r
                        // TODO: rec could be an immutable empty list\r
                List<Resource> rs = graph.syncRequest(new QueryIndex(global, type, filter), TransientCacheListener.<List<Resource>>instance());\r
                if(rec.isEmpty() && !rs.isEmpty()) {\r
                        // TODO: rec could be an immutable empty list\r

diff --git a/bundles/org.simantics.tests.modelled/META-INF/MANIFEST.MF b/bundles/org.simantics.tests.modelled/META-INF/MANIFEST.MF
index bce9a42cfbe87b1921e65ff79f1f64117a309b46..c0b1ba43acb8f4a590cc87585794625786d84793 100644 (file)
--- 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
 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.osgi,
  org.simantics,

- org.simantics.scl.compiler,

  org.junit,
  org.junit,

- org.simantics.db.testing,

  org.simantics.modeling;bundle-version="1.1.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
  org.simantics.modeling;bundle-version="1.1.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy