Sync git svn branch with SVN repository r33144.

[simantics/platform.git] / bundles / org.simantics.structural2 / src / org / simantics / structural2 / scl / CompileStructuralValueRequest.java

diff --git a/bundles/org.simantics.structural2/src/org/simantics/structural2/scl/CompileStructuralValueRequest.java b/bundles/org.simantics.structural2/src/org/simantics/structural2/scl/CompileStructuralValueRequest.java
index 8f68fa98ffbcc13891c91b6fa8f78a31d12e01dc..801c0c5f3785d7c9e12b7e37197e34f7ea07f004 100644 (file)
--- a/bundles/org.simantics.structural2/src/org/simantics/structural2/scl/CompileStructuralValueRequest.java
+++ b/bundles/org.simantics.structural2/src/org/simantics/structural2/scl/CompileStructuralValueRequest.java
@@ -37,15 +37,13 @@ public class CompileStructuralValueRequest extends AbstractCompileStructuralValu
     public static Object compileAndEvaluate(ReadGraph graph, Variable context) throws DatabaseException {\r
         SCLContext sclContext = SCLContext.getCurrent();\r
         Object oldGraph = sclContext.get("graph");\r
+        CompileStructuralValueRequest request = new CompileStructuralValueRequest(graph, context);\r
         try {\r
-            Function1<Variable,Object> exp = graph.syncRequest(new CompileStructuralValueRequest(graph, context),\r
-                    TransientCacheListener.<Function1<Variable,Object>>instance());\r
+            Function1<Variable,Object> exp = graph.syncRequest(request, TransientCacheListener.<Function1<Variable,Object>>instance());\r
             sclContext.put("graph", graph);\r
             return exp.apply(context);\r
-        } catch (DatabaseException e) {\r
-            throw (DatabaseException)e;\r
         } catch (Throwable t) {\r
-            throw new DatabaseException(t);\r
+            throw new DatabaseException("Compiling structural value request for component=" + request.component + ", literal=" + request.literal + " and relation " + request.relation + " failed!", t);\r
         } finally {\r
             sclContext.put("graph", oldGraph);\r
         }\r