Skip to content

Commit 7d9de84

Browse files
dakronewangkhcelasticmachine
authored
[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]>
1 parent 034b1c0 commit 7d9de84

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

server/src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.elasticsearch.action.admin.cluster.node.info.NodeInfo;
2323
import org.elasticsearch.action.admin.cluster.node.info.NodesInfoRequest;
2424
import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse;
25+
import org.elasticsearch.action.admin.cluster.node.info.PluginsAndModules;
2526
import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest;
2627
import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse;
2728
import org.elasticsearch.client.node.NodeClient;
@@ -97,8 +98,14 @@ private Table buildTable(RestRequest req, ClusterStateResponse state, NodesInfoR
9798

9899
for (DiscoveryNode node : nodes) {
99100
NodeInfo info = nodesInfo.getNodesMap().get(node.getId());
100-
101-
for (PluginInfo pluginInfo : info.getPlugins().getPluginInfos()) {
101+
if (info == null) {
102+
continue;
103+
}
104+
PluginsAndModules plugins = info.getPlugins();
105+
if (plugins == null) {
106+
continue;
107+
}
108+
for (PluginInfo pluginInfo : plugins.getPluginInfos()) {
102109
table.startRow();
103110
table.addCell(node.getId());
104111
table.addCell(node.getName());

0 commit comments

Comments
 (0)