Skip to content

Commit de56de9

Browse files
fix npe in RestPluginsAction (#52620)
Relates #45321 Co-authored-by: Elastic Machine <[email protected]>
1 parent 595beb9 commit de56de9

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;
@@ -96,8 +97,14 @@ private Table buildTable(RestRequest req, ClusterStateResponse state, NodesInfoR
9697

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

0 commit comments

Comments
 (0)