X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fgraph%2FReadGraphImpl.java;h=5d4852c0d7822efe1f88ef70a1a7eb6a941cb272;hb=638ce7e010a6292fedc677de18173676db305881;hp=27336b23d32474eda7bf7b00ab368a9cb5b56e02;hpb=035118aa5f35c9e5acd1f34d22065055dfdee486;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/graph/ReadGraphImpl.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/graph/ReadGraphImpl.java
index 27336b23d..5d4852c0d 100644
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/graph/ReadGraphImpl.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/graph/ReadGraphImpl.java
@@ -50,6 +50,7 @@ import org.simantics.db.DevelopmentKeys;
 import org.simantics.db.ExternalValueSupport;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.RelationContext;
+import org.simantics.db.RelationInfo;
 import org.simantics.db.Resource;
 import org.simantics.db.Session;
 import org.simantics.db.Statement;
@@ -1349,7 +1350,10 @@ public class ReadGraphImpl implements AsyncReadGraph {
 
 		Statement stm = getSingleStatement(resource, relation);
 		
-		return adaptContextual(stm.getObject(), new RelationContextImpl(resource, stm), RelationContext.class, clazz);
+		Object o = adaptContextual(stm.getObject(), new RelationContextImpl(resource, stm), RelationContext.class, clazz);
+		if (clazz.isInstance(o))
+			return (T)o;
+		throw new AdaptionException("Returned value is not expected class , got " + o.getClass().getName()+ " , expected " + clazz.getName());
 		
 	}
 
@@ -1846,8 +1850,35 @@ public class ReadGraphImpl implements AsyncReadGraph {
 
 		try {
 
-			Collection<Resource> objects = getObjects(subject, relation);
-			return !objects.isEmpty();
+			SyncReadProcedure<RelationInfo> procedure = new SyncReadProcedure<RelationInfo>();
+			processor.forRelationInfo(this, relation, procedure);
+			Collection<Resource> predicates = getPredicates(subject);
+			
+			if(procedure.result.isFinal) {
+				
+				return predicates.contains(relation);
+				
+			} else if (procedure.result.isFunctional) {
+
+				try {
+					int result = processor.getSingleObject(this, subject, relation);
+					return result != 0;
+				} catch (ManyObjectsForFunctionalRelationException e) {
+					return true;
+				} catch (DatabaseException e) {
+					throw new ServiceException(e);
+				}
+				
+			} else {
+
+				for(Resource predicate : getPredicates(subject)) {
+					if(isSubrelationOf(predicate, relation))
+						return true;
+				}
+				
+			}
+			
+			return false;
 
 		} catch (ServiceException e) {