X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FRelationInfoQuery.java;h=204a0005af1178a19efc6bc2edee8f9ea3747f07;hb=d0e8f57df83c175bac2098412ee71646fb9ff0e9;hp=667d2f1256917551ecff8bc0f68ff6501528cccb;hpb=9fcf23f51b59d737a05178832760a8dab950eb8d;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/RelationInfoQuery.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/RelationInfoQuery.java
index 667d2f125..204a0005a 100644
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/RelationInfoQuery.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/RelationInfoQuery.java
@@ -41,6 +41,7 @@ final public class RelationInfoQuery extends UnaryQuery<InternalProcedure<Relati
  			
 			@Override
 			public void execute(ReadGraphImpl graph, int i) throws DatabaseException {
+				if(done) return;
 				done = true;
 				RelationInfo result = new RelationInfo(r, isFunctional, isFinal, true);
 				if(entry != null) entry.setResult(result);
@@ -49,22 +50,20 @@ final public class RelationInfoQuery extends UnaryQuery<InternalProcedure<Relati
 
 			@Override
 			public void finished(ReadGraphImpl graph) throws DatabaseException {
-				if(!done) {
-					done = true;
-					RelationInfo result = new RelationInfo(r, isFunctional, isFinal, false);
-					if(entry != null) entry.setResult(result);
-					proc.execute(graph, result);
-				}
+				if(done) return;
+				done = true;
+				RelationInfo result = new RelationInfo(r, isFunctional, isFinal, false);
+				if(entry != null) entry.setResult(result);
+				proc.execute(graph, result);
 			}
 
 			@Override
 			public void exception(ReadGraphImpl graph, Throwable throwable) throws DatabaseException {
-				if(!done) {
-					done = true;
-					DatabaseException e = new DatabaseException("Internal error in RelationInfoQuery");
-					if(entry != null) entry.except(e);
-					proc.exception(graph, e);
-				}
+				if(done) return;
+				done = true;
+				DatabaseException e = new DatabaseException("Internal error in RelationInfoQuery");
+				if(entry != null) entry.except(e);
+				proc.exception(graph, e);
 			}
  			
  		});
@@ -78,14 +77,14 @@ final public class RelationInfoQuery extends UnaryQuery<InternalProcedure<Relati
  	    final int superRelationOf = provider.getSuperrelationOf();
         assert(superRelationOf != 0);
         
-        IntSet direct = QueryCache.resultDirectPredicates(graph, r, entry, null, QueryCache.emptyProcedureDirectPredicates);
-        IntSet types = QueryCache.resultTypes(graph, r, entry, null, QueryCache.emptyProcedureTypes);
+        IntSet direct = QueryCache.resultDirectPredicates(graph, r, entry, null);
+        IntSet types = QueryCache.resultTypes(graph, r, entry, null);
         
     	computeAssertions(graph, r, !direct.contains(superRelationOf), types.contains(graph.processor.getFunctionalRelation()), entry, procedure);
         
 	}
 
- 	@Override
+ 	//@Override
  	public Object compute(ReadGraphImpl graph, final InternalProcedure<RelationInfo> procedure) throws DatabaseException {
  		computeForEach(graph, id, this, procedure);
  		return getResult();