From 4543408dc8d63b5b9682a275e261d3168cdc2196 Mon Sep 17 00:00:00 2001
From: James <jamesagnew@gmail.com>
Date: Sat, 5 Aug 2017 06:55:50 -0400
Subject: [PATCH] Fix a potential deadlock

---
 .../ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoSubscriptionR4.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoSubscriptionR4.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoSubscriptionR4.java
index d81c933946f..72e751ca91a 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoSubscriptionR4.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoSubscriptionR4.java
@@ -104,8 +104,9 @@ public synchronized List<IBaseResource> getUndeliveredResourcesAndPurge(Long the
 		return retVal;
 	}
 
+	@Transactional(propagation = Propagation.NOT_SUPPORTED)
 	public int pollForNewUndeliveredResources() {
-		return pollForNewUndeliveredResources((String) null);
+		return pollForNewUndeliveredResources(null);
 	}
 
 	@Override