From 4b58013149836eededc568d295c5baf8fb3df989 Mon Sep 17 00:00:00 2001
From: "nathaniel.doef" <nathaniel.doef@smilecdr.com>
Date: Thu, 9 Feb 2023 14:09:25 -0500
Subject: [PATCH] fixes a regression caused my change in hapi-fhir

---
 .../message/SubscriptionDeliveringMessageSubscriber.java        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/message/SubscriptionDeliveringMessageSubscriber.java b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/message/SubscriptionDeliveringMessageSubscriber.java
index e0337876939..5314446f93a 100644
--- a/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/message/SubscriptionDeliveringMessageSubscriber.java
+++ b/hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/subscription/match/deliver/message/SubscriptionDeliveringMessageSubscriber.java
@@ -69,6 +69,8 @@ public class SubscriptionDeliveringMessageSubscriber extends BaseSubscriptionDel
 
 		if (payloadResource != null) {
 			ResourceModifiedJsonMessage newWrappedMessageToSend = convertDeliveryMessageToResourceModifiedMessage(theSourceMessage, payloadResource);
+			// preserve the message key that was set by the interceptor
+			newWrappedMessageToSend.getPayload().setMessageKey(theWrappedMessageToSend.getMessageKeyOrNull());
 			theWrappedMessageToSend.setPayload(newWrappedMessageToSend.getPayload());
 			payloadId = payloadResource.getIdElement().toUnqualifiedVersionless().getValue();
 		}