fix NPE in TransportGetDeploymentStatsAction

jan-elastic · jan-elastic · commit 3f7fb8181bb2 · 2025-07-22T10:09:19.000+02:00
diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetDeploymentStatsAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetDeploymentStatsAction.java
@@ -231,7 +231,7 @@ static GetDeploymentStatsAction.Response addFailedRoutes(
                     }
                 }
 
-                updatedNodeStats.sort(Comparator.comparing(n -> n.getNode().getId()));
+                updatedNodeStats.sort(Comparator.comparing(n -> n.getNode() != null ? n.getNode().getId() : ""));
                 updatedAssignmentStats.add(
                     new AssignmentStats(
                         stat.getDeploymentId(),
@@ -270,7 +270,7 @@ static GetDeploymentStatsAction.Response addFailedRoutes(
                     );
                 }
 
-                nodeStats.sort(Comparator.comparing(n -> n.getNode().getId()));
+                nodeStats.sort(Comparator.comparing(n -> n.getNode() != null ? n.getNode().getId() : ""));
 
                 updatedAssignmentStats.add(
                     new AssignmentStats(

Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ static GetDeploymentStatsAction.Response addFailedRoutes(`
`231`	`231`	`}`
`232`	`232`	`}`
`233`	`233`
`234`		`- updatedNodeStats.sort(Comparator.comparing(n -> n.getNode().getId()));`
	`234`	`+ updatedNodeStats.sort(Comparator.comparing(n -> n.getNode() != null ? n.getNode().getId() : ""));`
`235`	`235`	`updatedAssignmentStats.add(`
`236`	`236`	`new AssignmentStats(`
`237`	`237`	`stat.getDeploymentId(),`
`@@ -270,7 +270,7 @@ static GetDeploymentStatsAction.Response addFailedRoutes(`
`270`	`270`	`);`
`271`	`271`	`}`
`272`	`272`
`273`		`- nodeStats.sort(Comparator.comparing(n -> n.getNode().getId()));`
	`273`	`+ nodeStats.sort(Comparator.comparing(n -> n.getNode() != null ? n.getNode().getId() : ""));`
`274`	`274`
`275`	`275`	`updatedAssignmentStats.add(`
`276`	`276`	`new AssignmentStats(`