From 495e57b4ec92502b3241cee741e06aa648413458 Mon Sep 17 00:00:00 2001 From: James Agnew Date: Wed, 18 Jan 2017 22:18:03 -0500 Subject: [PATCH] Allow processing of transactions without a servlet in context --- .../main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java index 7cd4870071b..1f4f8803070 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java @@ -667,11 +667,15 @@ public abstract class BaseHapiFhirDao implements IDao { } protected void markRequestAsProcessingSubRequest(ServletRequestDetails theRequestDetails) { - theRequestDetails.getUserData().put(PROCESSING_SUB_REQUEST, Boolean.TRUE); + if (theRequestDetails != null) { + theRequestDetails.getUserData().put(PROCESSING_SUB_REQUEST, Boolean.TRUE); + } } protected void clearRequestAsProcessingSubRequest(ServletRequestDetails theRequestDetails) { - theRequestDetails.getUserData().remove(PROCESSING_SUB_REQUEST); + if (theRequestDetails != null) { + theRequestDetails.getUserData().remove(PROCESSING_SUB_REQUEST); + } } public String parseContentTextIntoWords(IBaseResource theResource) {