You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/03/28 13:27:52 UTC

[incubator-linkis] branch dev-1.1.0 updated: fix issue that once job npe #1813 (#1815)

This is an automated email from the ASF dual-hosted git repository.

peacewong pushed a commit to branch dev-1.1.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git


The following commit(s) were added to refs/heads/dev-1.1.0 by this push:
     new 25484ec  fix issue that once job npe #1813 (#1815)
25484ec is described below

commit 25484ece4955d33a92d7116851d589ddb7b0158e
Author: Casion <ca...@gmail.com>
AuthorDate: Mon Mar 28 21:27:46 2022 +0800

    fix issue that once job npe #1813 (#1815)
    
    Co-authored-by: peacewong <wp...@gmail.com>
---
 .../java/org/apache/linkis/manager/am/restful/EngineRestfulApi.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EngineRestfulApi.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EngineRestfulApi.java
index 1e13ebb..dd00cb2 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EngineRestfulApi.java
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EngineRestfulApi.java
@@ -91,7 +91,7 @@ public class EngineRestfulApi {
     private LabelBuilderFactory stdLabelBuilderFactory =
             LabelBuilderFactoryContext.getLabelBuilderFactory();
 
-    private Logger logger = LoggerFactory.getLogger(EMRestfulApi.class);
+    private Logger logger = LoggerFactory.getLogger(EngineRestfulApi.class);
 
     @RequestMapping(path = "/createEngineConn", method = RequestMethod.POST)
     public Message createEngineConn(HttpServletRequest req, @RequestBody JsonNode jsonNode)
@@ -135,9 +135,8 @@ public class EngineRestfulApi {
         retEngineNode.put("serviceInstance", engineNode.getServiceInstance());
         if (null == engineNode.getNodeStatus()) {
             engineNode.setNodeStatus(NodeStatus.Starting);
-        } else {
-            retEngineNode.put("nodeStatus", engineNode.getNodeStatus().toString());
         }
+        retEngineNode.put("nodeStatus", engineNode.getNodeStatus().toString());
         retEngineNode.put("ticketId", engineNode.getTicketId());
         retEngineNode.put("ecmServiceInstance", engineNode.getEMNode().getServiceInstance());
         return Message.ok("create engineConn succeed.").data("engine", retEngineNode);

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org