Merge pull request #1168 from legendtkl/rm/engines/npe

fix NPE for /linkisManager/rm/engines api
apache · Dec 8, 2021 · f03179a · f03179a
2 parents 040b79a + 0f03f2c
commit f03179a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...urce-manager/src/main/scala/org/apache/linkis/resourcemanager/restful/RMMonitorRest.scala b/...urce-manager/src/main/scala/org/apache/linkis/resourcemanager/restful/RMMonitorRest.scala
@@ -224,8 +224,10 @@ class RMMonitorRest extends Logging {
       val record = new mutable.HashMap[String, Any]
       record.put("applicationName", node.getServiceInstance.getApplicationName)
       record.put("engineInstance", node.getServiceInstance.getInstance)
-      record.put("moduleName", node.getEMNode.getServiceInstance.getApplicationName)
-      record.put("engineManagerInstance", node.getEMNode.getServiceInstance.getInstance)
+      if (node.getEMNode != null) {
+        record.put("moduleName", node.getEMNode.getServiceInstance.getApplicationName)
+        record.put("engineManagerInstance", node.getEMNode.getServiceInstance.getInstance)
+      }
       record.put("creator", userCreatorLabel.getCreator)
       record.put("engineType", engineTypeLabel.getEngineType)
       if(node.getNodeResource != null){