X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.structural2%2Fsrc%2Forg%2Fsimantics%2Fstructural2%2FFunctions.java;h=f3f9344aa2893cce478123b95d079c53a7b35fe1;hp=f429fdc91d104fabcaf53d6fd6c5752bdb1699ad;hb=69d61f8a5c49c5b6044f6e0cbc0723fa2e6ef164;hpb=7402926f3949dbb38e9f8f45e864ba4dd65b59b9

diff --git a/bundles/org.simantics.structural2/src/org/simantics/structural2/Functions.java b/bundles/org.simantics.structural2/src/org/simantics/structural2/Functions.java
index f429fdc91..f3f9344aa 100644
--- a/bundles/org.simantics.structural2/src/org/simantics/structural2/Functions.java
+++ b/bundles/org.simantics.structural2/src/org/simantics/structural2/Functions.java
@@ -180,7 +180,7 @@ public class Functions {
 		@Override
 		public Object getValue(ReadGraph graph, Variable context) throws DatabaseException {
 			StandardGraphPropertyVariable variable = (StandardGraphPropertyVariable)context; 
-			return new ConnectionImpl2(context.getParent(graph), variable.property.predicate);
+			return new ConnectionImpl(context.getParent(graph), variable.property.predicate);
 		}
 
 		@Override
@@ -572,7 +572,6 @@ public class Functions {
 				if(represents == null) return null;
                 Map<String, Resource> children = graph.syncRequest(new UnescapedChildMapOfResource(represents));
                 Resource child = children.get(name);
-                if(child == null) return null;
                 return StandardChildDomainChildren.getStandardChildDomainChildVariable(graph, context, child, name);
 			}
 
@@ -846,12 +845,12 @@ public class Functions {
         SCLContext sclContext = SCLContext.getCurrent();
         Object oldGraph = sclContext.get("graph");
         try {
-            Function1<Variable,Object> exp = graph.syncRequest(new CompileStructuralValueRequest(graph, context) {
+            Function1<Object,Object> exp = graph.syncRequest(new CompileStructuralValueRequest(graph, context) {
                 protected String getExpressionText(ReadGraph graph) throws DatabaseException {
                     return expression;
                 }
             },
-            TransientCacheListener.<Function1<Variable,Object>>instance());
+            TransientCacheListener.instance());
             sclContext.put("graph", graph);
             return exp.apply(context);
         } catch (DatabaseException e) {