X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fgraph%2FReadGraphImpl.java;h=cffbba51c75f852e44b215747e94efafa099e296;hp=3feb22e00ebda688379b6ed7c8785b09fb8035ca;hb=6839744ff43f5adaa2fc38121952dba846690558;hpb=7396956f115b87067970f690588017fc05393e7a

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 3feb22e00..cffbba51c 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
@@ -45,6 +45,7 @@ import org.simantics.databoard.type.Datatype;
 import org.simantics.databoard.util.binary.BinaryFile;
 import org.simantics.databoard.util.binary.RandomAccessBinary;
 import org.simantics.db.AsyncReadGraph;
+import org.simantics.db.ComputationalValue;
 import org.simantics.db.DevelopmentKeys;
 import org.simantics.db.ExternalValueSupport;
 import org.simantics.db.ReadGraph;
@@ -5913,6 +5914,8 @@ public class ReadGraphImpl implements AsyncReadGraph {
             }
             Serializer serializer = binding.serializer();
             byte[] bytes = serializer.serialize(initialValue);
+            // In case the file has been previously accessed and was larger we set the correct size now
+            rd.binaryFile.setLength(bytes.length);
             rd.binaryFile.write(bytes);
             ravs.put(resource, rd);
             return rd;
@@ -6102,12 +6105,18 @@ public class ReadGraphImpl implements AsyncReadGraph {
     			return getValue(r, binding);
     		}
     	} else if(types.contains(L0.ExternalValue)) {
-    		try {
-    			return (T)ReflectionUtils.getValue(getURI(r)).getValue();
-    		} catch(ValueNotFoundException e) {
-    			throw new DatabaseException(e);
-    		} catch(ClassCastException e) {
-    			throw new DatabaseException(e);
+    		ComputationalValue cv = syncRequest(new PossibleAdapter<ComputationalValue>(r, ComputationalValue.class), TransientCacheAsyncListener.instance());
+    		if(cv != null) {
+    			return cv.getValue(this, r);
+    		} else {
+    			// This should not even be possible since L0 defines an adapter for all values
+    			try {
+    				return (T)ReflectionUtils.getValue(getURI(r)).getValue();
+    			} catch(ValueNotFoundException e) {
+    				throw new DatabaseException(e);
+    			} catch(ClassCastException e) {
+    				throw new DatabaseException(e);
+    			}
     		}
     	}
     	else {
@@ -6172,11 +6181,12 @@ public class ReadGraphImpl implements AsyncReadGraph {
     @Override
     public <T> T getRelatedValue2(Resource subject, Resource relation, Object context) throws DatabaseException {
 		if(Development.DEVELOPMENT) {
-			String error = L0Validations.checkValueType(this, subject, relation);
-			if(error != null) {
-				Logger.defaultLogError(new ValidationException(error));
-				//throw new ValidationException(error);
-				new ValidationException(error).printStackTrace();
+			if(Development.<Boolean>getProperty(DevelopmentKeys.L0_VALIDATION, Bindings.BOOLEAN)) {
+				String error = L0Validations.checkValueType(this, subject, relation);
+				if(error != null) {
+					Logger.defaultLogError(new ValidationException(error));
+					throw new ValidationException(error);
+				}
 			}
 		}
         return getValue2(getSingleObject(subject, relation), context);
@@ -6185,12 +6195,13 @@ public class ReadGraphImpl implements AsyncReadGraph {
     @Override
     public Variant getRelatedVariantValue2(Resource subject, Resource relation, Object context) throws DatabaseException {
         if(Development.DEVELOPMENT) {
-            String error = L0Validations.checkValueType(this, subject, relation);
-            if(error != null) {
-                Logger.defaultLogError(new ValidationException(error));
-                //throw new ValidationException(error);
-                new ValidationException(error).printStackTrace();
-            }
+			if(Development.<Boolean>getProperty(DevelopmentKeys.L0_VALIDATION, Bindings.BOOLEAN)) {
+				String error = L0Validations.checkValueType(this, subject, relation);
+				if(error != null) {
+					Logger.defaultLogError(new ValidationException(error));
+					throw new ValidationException(error);
+				}
+			}
         }
         return getVariantValue2(getSingleObject(subject, relation), context);
     }