Fixed multiple issues causing dangling references to discarded queries

[simantics/platform.git] / bundles / org.simantics.document.server / src / org / simantics / document / server / request / NodeRequestUtils.java

diff --git a/bundles/org.simantics.document.server/src/org/simantics/document/server/request/NodeRequestUtils.java b/bundles/org.simantics.document.server/src/org/simantics/document/server/request/NodeRequestUtils.java
index ed0c54c968b8043e8fc7383655f8b9cf268a6236..00eb2a492ffd4243329e8b0d2706a7d4535d0d68 100644 (file)
--- a/bundles/org.simantics.document.server/src/org/simantics/document/server/request/NodeRequestUtils.java
+++ b/bundles/org.simantics.document.server/src/org/simantics/document/server/request/NodeRequestUtils.java
@@ -24,10 +24,13 @@ public class NodeRequestUtils {
                if (t instanceof DocumentException) {
                        return t.getMessage();
                } else if (t instanceof MissingVariableException) {
-                       return "Evaluation of property '" + name + "' failed\n" +
-                                       t.getMessage();
+                       return name + ":\n" +
+                                       t.getMessage().replaceAll("(?m)^", "  ");
                } else if (t instanceof SCLDatabaseException) {
-                       return t.getMessage();
+                       StringBuilder sb = new StringBuilder();
+                       sb.append(name + ":\n");
+                       sb.append(t.getMessage().replaceAll("(?m)^", "  "));
+                       return sb.toString();
                } else if (t instanceof NotFoundException) {
                        return t.getMessage();
                } else if (t instanceof ImportFailureException) {