return script on error

anti43 · Dec 27, 2014 · a85d2f4 · a85d2f4
1 parent 1406f6c
commit a85d2f4
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/mpv5/db/common/DatabaseObject.java b/src/mpv5/db/common/DatabaseObject.java
@@ -71,6 +71,7 @@
 import mpv5.utils.export.Export;
 import mpv5.utils.jobs.Job;
 import mpv5.utils.jobs.Waiter;
+import org.codehaus.groovy.control.CompilationFailedException;
 
 /**
  * Database Objects reflect a row in a table, and can parse graphical and
@@ -2497,11 +2498,16 @@ private GroovyShell getGroovyShell() {
      * @return
      */
     public synchronized String evaluate(String script) {
-        String sm = GlobalSettings.getProperty("org.openyabs.config.scriptsymbol", "#");
-        if(script.startsWith(sm) && script.endsWith(sm)){
-           script = script.substring(1, script.length()-1);
+        try {
+            String sm = GlobalSettings.getProperty("org.openyabs.config.scriptsymbol", "#");
+            if (script.startsWith(sm) && script.endsWith(sm)) {
+                script = script.substring(1, script.length() - 1);
+            }
+            return String.valueOf(getGroovyShell().evaluate(script));
+        } catch (CompilationFailedException compilationFailedException) {
+            Log.Debug(compilationFailedException);
         }
-        return String.valueOf(getGroovyShell().evaluate(script));
+        return script;
     }
 
     /**