From: Antti Villberg <antti.villberg@semantum.fi>
Date: Wed, 14 Dec 2016 07:19:47 +0000 (+0200)
Subject: Document server should use variable value request with binding
X-Git-Tag: v1.25.0~9
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=b48839dfe2256ce361db6194f51e11b3363be5fa;p=simantics%2Fplatform.git

Document server should use variable value request with binding

refs #6876

Change-Id: I772b301b7b66f60e2834d01e9a1a7b1d300adb26
---

diff --git a/bundles/org.simantics.document.server/src/org/simantics/document/server/Functions.java b/bundles/org.simantics.document.server/src/org/simantics/document/server/Functions.java
index 2ba85b733..e374b700f 100644
--- a/bundles/org.simantics.document.server/src/org/simantics/document/server/Functions.java
+++ b/bundles/org.simantics.document.server/src/org/simantics/document/server/Functions.java
@@ -29,7 +29,7 @@ import org.simantics.db.layer0.function.All;
 import org.simantics.db.layer0.request.ProjectModels;
 import org.simantics.db.layer0.request.VariableProperty;
 import org.simantics.db.layer0.request.VariableRead;
-import org.simantics.db.layer0.request.VariableValue;
+import org.simantics.db.layer0.request.VariableValueWithBinding;
 import org.simantics.db.layer0.variable.ConstantPropertyVariable;
 import org.simantics.db.layer0.variable.ProxyChildVariable;
 import org.simantics.db.layer0.variable.ProxySessionRequest;
@@ -1071,7 +1071,7 @@ public class Functions {
     
     public static Object getPropertyValueCached(ReadGraph graph, Variable variable, String name, Binding binding) throws DatabaseException {
     	Variable property = graph.syncRequest(new VariableProperty(variable, name));
-    	return graph.syncRequest(new VariableValue<Object>(property));
+    	return graph.syncRequest(new VariableValueWithBinding<Object>(property, binding));
     }
 
     public static class ParentExistsRequest extends VariableRead<Boolean> {