Merge pull request apache#298 from WeDataSphere/dev-1.1.16-engine-err…

…or-msg 【1.1.16】Empty pointer exception prompt when optimizing query task logs
mayinrain · Oct 7, 2023 · ce4e5dc · ce4e5dc
2 parents 97e5627 + d22a35a
commit ce4e5dc
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/...-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EMRestfulApi.java b/...-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EMRestfulApi.java
@@ -59,6 +59,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 
+import java.text.MessageFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -436,6 +437,12 @@ public Message openEngineLog(HttpServletRequest req, @RequestBody JsonNode jsonN
 
   private Message executeECMOperation(
       EMNode ecmNode, String engineInstance, ECMOperateRequest ecmOperateRequest) {
+    if (Objects.isNull(ecmNode)) {
+      return Message.error(
+          MessageFormat.format(
+              "ECM node :[{0}]  does not exist, Unable to open engine log(ECM节点:[{1}] 异常，无法打开日志，可能是该节点服务重启或者服务异常导致)",
+              engineInstance, engineInstance));
+    }
     String operationName = OperateRequest$.MODULE$.getOperationName(ecmOperateRequest.parameters());
     String userName = ecmOperateRequest.user();
     if (ArrayUtils.contains(adminOperations, operationName) && Configuration.isNotAdmin(userName)) {