X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.common%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fcommon%2Frequest%2FTypeString.java;h=1813b0744f0318b5418a64c7e0d439a468429103;hb=55d1e6f63df516019032ebf0c1e9c8c0495a619d;hp=9439ad28e75b5e6aa54fc34630a3cc7c7ffa4d46;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/TypeString.java b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/TypeString.java
index 9439ad28e..1813b0744 100644
--- a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/TypeString.java
+++ b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/TypeString.java
@@ -46,13 +46,19 @@ public class TypeString extends BinaryRead<ResourceSet, String, String> {
         boolean first = true;
     	for(Resource r : parameter) {
     	    String name = graph.getPossibleRelatedValue(r, L0.HasName, Bindings.STRING);
-            if(!first) result.append(parameter2);
-            else first = false;
-            result.append(name);
+    	    if (name != null) {
+                if(!first) result.append(parameter2);
+                else first = false;
+                result.append(escapeToken(name));
+    	    }
     	}
     	
     	return result.toString();
     	
     }
+    
+    public static String escapeToken(String token) {
+    	return token.replaceAll("( |\\\\)", "\\\\$0");
+	}
 
 }
\ No newline at end of file