From 4c419ec5d6edae8e3ab767a803890af21f7fc55e Mon Sep 17 00:00:00 2001
From: Ken Stevens <khstevens@gmail.com>
Date: Tue, 5 Mar 2019 14:53:47 -0500
Subject: [PATCH] Remove duplicate fhirContext that interferes with settings
 such as the following

getFhirContext().getParserOptions().setStripVersionsFromReferences(false);
---
 src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java b/src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java
index f4fbece..4950393 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/JpaRestfulServer.java
@@ -47,8 +47,6 @@ public class JpaRestfulServer extends RestfulServer {
          * specified in the properties file.
          */
         FhirVersionEnum fhirVersion = HapiProperties.getFhirVersion();
-        setFhirContext(new FhirContext(fhirVersion));
-
         appCtx = new AnnotationConfigApplicationContext();
 
         /*
@@ -74,6 +72,9 @@ public class JpaRestfulServer extends RestfulServer {
         } else {
             throw new IllegalStateException();
         }
+
+        setFhirContext(appCtx.getBean(FhirContext.class));
+
         registerProviders(resourceProviders);
         registerProvider(systemProvider);