Skip to content

NIAD-5467 - Clinical information missing from bundle #1306

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
MartinWheelerMT merged 1 commit into from
Aug 11, 2026
Merged

NIAD-5467 - Clinical information missing from bundle #1306

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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
### Fixed

* Fixed spelling error in measurement unit "milliliter".
* Add thread-safe synchronisation when merging and uncompressing a large EHR Extract bundle to avoid a race condition
occurring where multiple threads may attempt to merge and uncompress the same EHR Extract bundle at the same time.
This could result in a corrupted EHR Extract bundle.

## [3.3.1] - 2026-06-01

Expand Down
9 changes: 5 additions & 4 deletions gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/task/COPCMessageHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,12 @@ public void handleMessage(InboundMessage inboundMessage, String conversationId)
checkAndMergeFileParts(inboundMessage, conversationId);
nackAckPreparationService.sendAckMessage(payload, conversationId, migrationRequest.getLosingPracticeOdsCode());

// merge and uncompress large EHR message
if (inboundMessageMergingService.canMergeCompleteBundle(conversationId)) {
inboundMessageMergingService.mergeAndBundleMessage(conversationId);
synchronized (this) {
// merge and uncompress large EHR message
if (inboundMessageMergingService.canMergeCompleteBundle(conversationId)) {
inboundMessageMergingService.mergeAndBundleMessage(conversationId);
}
}

} catch (WebClientRequestException | ConnectionException | MhsServerErrorException e) {
throw e;
} catch (ParseException | ValidationException | SAXException e) {
Expand Down
Loading