[7.x] fix npe in RestPluginsAction (#52620) (de56de9) (#52721)

Relates #45321 Co-authored-by: Elastic Machine <[email protected]> Co-authored-by: Kaihong.Wang <[email protected]> Co-authored-by: Elastic Machine <[email protected]>
elastic · Feb 24, 2020 · 7d9de84 · 7d9de84
1 parent 034b1c0
commit 7d9de84
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/server/src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java b/server/src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java
@@ -22,6 +22,7 @@
 import org.elasticsearch.action.admin.cluster.node.info.NodeInfo;
 import org.elasticsearch.action.admin.cluster.node.info.NodesInfoRequest;
 import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse;
+import org.elasticsearch.action.admin.cluster.node.info.PluginsAndModules;
 import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest;
 import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse;
 import org.elasticsearch.client.node.NodeClient;
@@ -97,8 +98,14 @@ private Table buildTable(RestRequest req, ClusterStateResponse state, NodesInfoR
 
         for (DiscoveryNode node : nodes) {
             NodeInfo info = nodesInfo.getNodesMap().get(node.getId());
-
-            for (PluginInfo pluginInfo : info.getPlugins().getPluginInfos()) {
+            if (info == null) {
+                continue;
+            }
+            PluginsAndModules plugins = info.getPlugins();
+            if (plugins == null) {
+                continue;
+            }
+            for (PluginInfo pluginInfo : plugins.getPluginInfos()) {
                 table.startRow();
                 table.addCell(node.getId());
                 table.addCell(node.getName());