Skip to content

O3-5396: Fix NPE when undoing a queue transition #108

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
chibongho merged 1 commit into from
Apr 9, 2026
Merged

O3-5396: Fix NPE when undoing a queue transition #108

Show file tree
Hide file tree
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
5 changes: 4 additions & 1 deletion api/src/main/java/org/openmrs/module/queue/api/dao/impl/QueueEntryDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,10 @@ public boolean updateIfUnmodified(QueueEntry queueEntry, Date expectedDateChange
}

javax.persistence.Query query = session.createQuery(jpql.toString());
query.setParameter("endedAt", Date.from(queueEntry.getEndedAt().toInstant().truncatedTo(ChronoUnit.SECONDS)));
Date endedAt = queueEntry.getEndedAt() != null
? Date.from(queueEntry.getEndedAt().toInstant().truncatedTo(ChronoUnit.SECONDS))
: null;
query.setParameter("endedAt", endedAt);
query.setParameter("id", queueEntry.getQueueEntryId());
if (expectedDateChanged != null) {
query.setParameter("expectedDateChanged", expectedDateChanged);
Expand Down
16 changes: 16 additions & 0 deletions integration-tests/src/test/java/org/openmrs/module/queue/api/dao/QueueEntryDaoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,22 @@ public void shouldSearchAndCountQueueEntriesEndedOnOrBeforeDate() {
assertResults(criteria, 2, 3);
}

@Test
public void updateIfUnmodified_shouldClearEndedAtWhenSetToNull() {
// Entry 1 has ended_at set; this mirrors what undoTransition does when re-opening a previous entry
QueueEntry queueEntry = dao.get(QUEUE_ENTRY_UUID).orElseThrow(IllegalStateException::new);
assertThat(queueEntry.getEndedAt(), notNullValue());

queueEntry.setEndedAt(null);

// date_changed is null in the dataset, so expectedDateChanged is null
boolean updated = dao.updateIfUnmodified(queueEntry, queueEntry.getDateChanged());

assertThat(updated, is(true));
QueueEntry reloaded = dao.get(QUEUE_ENTRY_UUID).orElseThrow(IllegalStateException::new);
assertThat(reloaded.getEndedAt(), nullValue());
}

@Test
// 2022-02-02 18:40:56.0, 2022-02-02 18:41:56.0
public void shouldSearchAndCountQueueEntriesEndedOnOrAfterDate() {
Expand Down
Loading