X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=bundles%2Forg.simantics.document.server%2Fsrc%2Forg%2Fsimantics%2Fdocument%2Fserver%2Frequest%2FServerSCLValueRequest.java;h=b2dc03b73f3fee14c847a686f9b7fe6c6229d886;hb=68ce0966a57f5153b133c6283fdbae10f683b745;hp=9655e0f86d96e074b7d9a9fa9027343209736667;hpb=46c8189fee24a71d1ce0634e12db5a696e952b10;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.document.server/src/org/simantics/document/server/request/ServerSCLValueRequest.java b/bundles/org.simantics.document.server/src/org/simantics/document/server/request/ServerSCLValueRequest.java
index 9655e0f86..b2dc03b73 100644
--- a/bundles/org.simantics.document.server/src/org/simantics/document/server/request/ServerSCLValueRequest.java
+++ b/bundles/org.simantics.document.server/src/org/simantics/document/server/request/ServerSCLValueRequest.java
@@ -1,5 +1,6 @@
 package org.simantics.document.server.request;
 
+import java.util.Collections;
 import java.util.Map;
 
 import org.simantics.databoard.Bindings;
@@ -104,10 +105,16 @@ public class ServerSCLValueRequest extends AbstractExpressionCompilationRequest<
 				return Pair.make(type, root);
 			} else {
 				Resource doc = graph.syncRequest(new PossibleTypedParent(component, DocumentationResource.getInstance(graph).Document));
-				Resource componentType = graph.getSingleType(doc);
-                Resource root = graph.syncRequest(new IndexRoot(doc));
-            //    System.err.println("getComponentTypeAndRoot4 " + graph.getPossibleURI(component) + " => " + graph.getPossibleURI(componentType) + " " + graph.getPossibleURI(root));
-				return Pair.make(componentType, root);
+				if(doc != null) {
+					Resource componentType = graph.getSingleType(doc);
+	                Resource root = graph.syncRequest(new IndexRoot(doc));
+					return Pair.make(componentType, root);
+				} else {
+					System.err.println("component = " + component);
+					Resource root = graph.syncRequest(new IndexRoot(component));
+//					Resource componentType = graph.getSingleType(doc);
+					return Pair.make(null, root);
+				}
 			}
 		}
 		throw new IllegalStateException();
@@ -161,10 +168,14 @@ public class ServerSCLValueRequest extends AbstractExpressionCompilationRequest<
 			public CompilationContext perform(ReadGraph graph)
 					throws DatabaseException {
 				RuntimeEnvironment runtimeEnvironment = graph.syncRequest(getRuntimeEnvironmentRequest(parameter.first, parameter.second));
-				Map<String, ComponentTypeProperty> propertyMap =
-						graph.syncRequest(new ReadComponentTypeInterfaceRequest(parameter.first, runtimeEnvironment.getEnvironment()),
-								TransientCacheListener.<Map<String, ComponentTypeProperty>>instance());
-				return new CompilationContext(runtimeEnvironment, propertyMap);
+				if(parameter.first != null) {
+					Map<String, ComponentTypeProperty> propertyMap =
+							graph.syncRequest(new ReadComponentTypeInterfaceRequest(parameter.first, runtimeEnvironment.getEnvironment()),
+									TransientCacheListener.<Map<String, ComponentTypeProperty>>instance());
+					return new CompilationContext(runtimeEnvironment, propertyMap);
+				} else {
+					return new CompilationContext(runtimeEnvironment, Collections.emptyMap());
+				}
 			}
 		});
 	}