Skip to content

Null-safe compare for ticket milestones without due date #1278

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 1 commit into from
Jun 10, 2019
Merged

Null-safe compare for ticket milestones without due date #1278

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
16 changes: 14 additions & 2 deletions src/main/java/com/gitblit/wicket/pages/TicketsPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,14 +521,26 @@ public void populateItem(final Item<TicketSort> item) {
Collections.sort(openMilestones, new Comparator<TicketMilestone>() {
@Override
public int compare(TicketMilestone o1, TicketMilestone o2) {
return o2.due.compareTo(o1.due);
if (o1.due == null) {
return (o2.due == null) ? 0 : 1;
} else if (o2.due == null) {
return -1;
} else {
return o1.due.compareTo(o2.due);
}
}
});

Collections.sort(closedMilestones, new Comparator<TicketMilestone>() {
@Override
public int compare(TicketMilestone o1, TicketMilestone o2) {
return o2.due.compareTo(o1.due);
if (o1.due == null) {
return (o2.due == null) ? 0 : 1;
} else if (o2.due == null) {
return -1;
} else {
return o1.due.compareTo(o2.due);
}
}
});

Expand Down