X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.db.procore%2Fsrc%2Ffi%2Fvtt%2Fsimantics%2Fprocore%2Finternal%2FDirectQuerySupportImpl.java;h=7f27a0261a0dd97f45cca02e79da1e5805fcd2af;hp=a0f6c1d1eb3cd437a65a340083c4d1ed1f6c241b;hb=bc5e6cb19f6af5f67bc5cfaad7d602841b8fdd0b;hpb=91682baa9a8252390f09b80fd724f47e5957b234

diff --git a/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/DirectQuerySupportImpl.java b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/DirectQuerySupportImpl.java
index a0f6c1d1e..7f27a0261 100644
--- a/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/DirectQuerySupportImpl.java
+++ b/bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/DirectQuerySupportImpl.java
@@ -8,6 +8,7 @@ import org.simantics.db.Resource;
 import org.simantics.db.common.procedure.wrapper.NoneToAsyncProcedure;
 import org.simantics.db.common.procedure.wrapper.SyncToAsyncProcedure;
 import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.exception.NoSingleResultException;
 import org.simantics.db.impl.ClusterI;
 import org.simantics.db.impl.ClusterI.ClusterTypeEnum;
 import org.simantics.db.impl.ForEachObjectContextProcedure;
@@ -30,9 +31,13 @@ import org.simantics.db.procore.cluster.ResourceTableSmall;
 import org.simantics.db.procore.cluster.ValueTableSmall;
 import org.simantics.db.request.AsyncRead;
 import org.simantics.db.service.DirectQuerySupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DirectQuerySupportImpl implements DirectQuerySupport {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(DirectQuerySupportImpl.class);
+
 	final private SessionImplSocket session;
 	
 	DirectQuerySupportImpl(SessionImplSocket session) {
@@ -775,7 +780,7 @@ public class DirectQuerySupportImpl implements DirectQuerySupport {
 			int so = cluster.getSingleObject(subject, procedure, session.clusterTranslator);
 			if(so == 0) {
 				if(result == 0) {
-					procedure.exception(graph, new DatabaseException("No objects " + subject + " " + procedure.predicateKey));
+					procedure.exception(graph, new NoSingleResultException("No objects " + subject + " " + procedure.predicateKey, result));
 //					graph.dec();
 				} else {
 					getValue4(graph, cluster, result, context, procedure);
@@ -784,13 +789,13 @@ public class DirectQuerySupportImpl implements DirectQuerySupport {
 				if(result == 0) {
 					getValue4(graph, cluster, so, context, procedure);
 				} else {
-					procedure.exception(graph, new DatabaseException("Multiple objects"));
+					procedure.exception(graph, new NoSingleResultException("Multiple objects for " + subject + " " + procedure.predicateKey, result));
 //					graph.dec();
 				}
 			}
 
 		} catch (DatabaseException e) {
-			e.printStackTrace();
+			LOGGER.error("Could not compute related value for subject {} with predicate {}", subject, procedure.predicateKey);
 		}
 		
 	}