Skip to content
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

Jump to bottom

Fix an NPE when a task does not exist #880

Merged
merged 1 commit into from
May 30, 2023
Merged

Fix an NPE when a task does not exist #880

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
4 changes: 4 additions & 0 deletions src/main/java/com/conveyal/analysis/controllers/UserActivityController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ private Object removeActivity (Request req, Response res) {
UserPermissions userPermissions = UserPermissions.from(req);
String id = req.params("id");
Task task = taskScheduler.getTaskForUser(userPermissions.email, id);
// Check if task still exists before attempting to remove.
if (task == null) {
throw AnalysisServerException.notFound("Task does not exist. It may have already been removed by another user.");
}
// Disallow removing active tasks via the API.
if (task.state.equals(Task.State.ACTIVE)) {
throw AnalysisServerException.badRequest("Cannot clear an active task.");
Expand Down