X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fgraph%2FReadGraphImpl.java;h=cc15c1eac9111e063369cadd9c7167b3c843b4a9;hb=refs%2Fchanges%2F48%2F4248%2F1;hp=61580bfdcb6ae9a96680952b070261057b9a2fe6;hpb=15af8a20abe8b2ba24b52c9da8bce6c92351dc43;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 61580bfdc..cc15c1eac 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
@@ -1349,7 +1349,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());
 		
 	}
 
@@ -1511,15 +1514,15 @@ public class ReadGraphImpl implements AsyncReadGraph {
 
 		try {
 
-		    int result = processor.getSingleObject(this, subject, relation);
-		    if(result == 0) return null;
-		    
-		    return processor.querySupport.getResource(result);
+			int result = processor.getSingleObject(this, subject, relation);
+			if(result == 0) return null;
+
+			return processor.querySupport.getResource(result);
 
-	     } catch (ManyObjectsForFunctionalRelationException e) {
+		} catch (ManyObjectsForFunctionalRelationException e) {
+
+			throw new ManyObjectsForFunctionalRelationException("Many objects in " + subject + " for functional relation " + relation);
 
-	         throw new ManyObjectsForFunctionalRelationException("subject=" + subject + ", relation=" + relation, e);
-	         
 		} catch (DatabaseException e) {
 
 			throw new ServiceException(e);