Skip to content

Commit e89253f

Browse files
wangkhcelasticmachine
authored andcommitted
fix npe in RestPluginsAction (elastic#52620)
Relates elastic#45321 Co-authored-by: Elastic Machine <[email protected]>
1 parent ff0053f commit e89253f

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;
@@ -94,8 +95,14 @@ private Table buildTable(RestRequest req, ClusterStateResponse state, NodesInfoR
9495

9596
for (DiscoveryNode node : nodes) {
9697
NodeInfo info = nodesInfo.getNodesMap().get(node.getId());
97-
98-
for (PluginInfo pluginInfo : info.getPlugins().getPluginInfos()) {
98+
if (info == null) {
99+
continue;
100+
}
101+
PluginsAndModules plugins = info.getPlugins();
102+
if (plugins == null) {
103+
continue;
104+
}
105+
for (PluginInfo pluginInfo : plugins.getPluginInfos()) {
99106
table.startRow();
100107
table.addCell(node.getId());
101108
table.addCell(node.getName());

0 commit comments

Comments
 (0)