Skip to content

Fix possible NPE in RestTasksAction.java #17778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 8, 2025
Merged

Fix possible NPE in RestTasksAction.java #17778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
adc9466
Update RestTasksAction.java
ngr-ilmarh Apr 3, 2025
aa22955
Update unittest in RestTasksActionTests.java
ngr-ilmarh Apr 4, 2025
c4d5af2
Merge branch 'opensearch-project:main' into Fix-#17762-NPE-in-RestTas…
ngr-ilmarh Apr 7, 2025
065de7c
add needed imports and fix random generation
ngr-ilmarh Apr 7, 2025
de80ca0
Merge branch 'opensearch-project:main' into Fix-#17762-NPE-in-RestTas…
ngr-ilmarh Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion server/src/main/java/org/opensearch/rest/action/cat/RestTasksAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ private void buildRow(Table table, boolean fullId, boolean detailed, DiscoveryNo
// Node information. Note that the node may be null because it has left the cluster between when we got this response and now.
table.addCell(fullId ? nodeId : Strings.substring(nodeId, 0, 4));
table.addCell(node == null ? "-" : node.getHostAddress());
table.addCell(node.getAddress().address().getPort());
table.addCell(node == null ? "-" : node.getAddress().address().getPort());
table.addCell(node == null ? "-" : node.getName());
table.addCell(node == null ? "-" : node.getVersion().toString());
table.addCell(taskInfo.getHeaders().getOrDefault(Task.X_OPAQUE_ID, "-"));
Expand Down
22 changes: 21 additions & 1 deletion server/src/test/java/org/opensearch/rest/action/cat/RestTasksActionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,19 @@
import org.opensearch.common.collect.MapBuilder;
import org.opensearch.core.action.ActionListener;
import org.opensearch.core.action.ActionResponse;
import org.opensearch.core.tasks.TaskId;
import org.opensearch.core.xcontent.NamedXContentRegistry;
import org.opensearch.tasks.TaskInfo;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.test.client.NoOpNodeClient;
import org.opensearch.test.rest.FakeRestChannel;
import org.opensearch.test.rest.FakeRestRequest;

import java.util.List;
import java.util.Map;

import static java.util.Collections.emptyList;
import static org.opensearch.tasks.TaskInfoTests.randomResourceStats;
import static org.hamcrest.Matchers.is;

public class RestTasksActionTests extends OpenSearchTestCase {
Expand Down Expand Up @@ -77,7 +83,21 @@ public <Request extends ActionRequest, Response extends ActionResponse> void doE
Request request,
ActionListener<Response> listener
) {
listener.onResponse((Response) new ListTasksResponse(emptyList(), emptyList(), emptyList()));
final TaskInfo taskInfo = new TaskInfo(
new TaskId("test-node-id", randomLong()),
"test_type",
"test_action",
"test_description",
null,
randomLong(),
randomLongBetween(0, Long.MAX_VALUE),
false,
false,
TaskId.EMPTY_TASK_ID,
Map.of("foo", "bar"),
randomResourceStats(randomBoolean())
);
listener.onResponse((Response) new ListTasksResponse(List.of(taskInfo), emptyList(), emptyList()));
}
};
}
Expand Down
Loading