Skip to content

Fix NPE in batchPoll by returning 200 OK + empty list instead of 204 #608

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
nthmost-orkes merged 1 commit into from
Oct 16, 2025
Merged

Fix NPE in batchPoll by returning 200 OK + empty list instead of 204 #608

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 3 additions & 6 deletions rest/src/main/java/com/netflix/conductor/rest/controllers/TaskResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,9 @@ public ResponseEntity<List<Task>> batchPoll(
@RequestParam(value = "domain", required = false) String domain,
@RequestParam(value = "count", defaultValue = "1") int count,
@RequestParam(value = "timeout", defaultValue = "100") int timeout) {
// for backwards compatibility with 2.x client which expects a 204 when no Task is found
return Optional.ofNullable(
taskService.batchPoll(taskType, workerId, domain, count, timeout))
.filter(tasks -> !tasks.isEmpty())
.map(ResponseEntity::ok)
.orElse(ResponseEntity.noContent().build());
List<Task> tasks = taskService.batchPoll(taskType, workerId, domain, count, timeout);
// Return empty list instead of 204 to avoid NPE in client libraries
return ResponseEntity.ok(tasks != null ? tasks : List.of());
}

@PostMapping(produces = TEXT_PLAIN_VALUE)
Expand Down
Loading