add whether GroovyShellUtil.eval() is null

datavane · May 8, 2024 · 0ee8d22 · 0ee8d22
1 parent 2506f23
commit 0ee8d22
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/tis-plugin/src/main/java/com/qlangtech/tis/extension/util/GroovyShellEvaluate.java b/tis-plugin/src/main/java/com/qlangtech/tis/extension/util/GroovyShellEvaluate.java
@@ -34,7 +34,8 @@ public class GroovyShellEvaluate {
  boolean loaded = false;
  try {
  loaded = (null != Class.forName("com.qlangtech.tis.runtime.module.action.BasicModule"));
- } catch (ClassNotFoundException e) { }
+ } catch (ClassNotFoundException e) {
+ }
  isInConsoleModule = loaded;
  }
 
@@ -66,7 +67,11 @@ public static Object scriptEval(String script, Function<Object, Object>... proce
 
  Callable<Object> valGetter = () -> {
  for (Function<Object, Object> f : process) {
- return f.apply(GroovyShellUtil.eval(meta.getName()));
+ Object val = GroovyShellUtil.eval(meta.getName());
+ if (val == null) {
+ return null;
+ }
+ return f.apply(val);
  }
  return GroovyShellUtil.eval(meta.getName());
  };