FM2-642: Saner loading of GP listener

openmrs · Sep 10, 2024 · 704eae3 · 704eae3
1 parent ca8bf98
commit 704eae3
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/api/src/main/java/org/openmrs/module/fhir2/FhirActivator.java b/api/src/main/java/org/openmrs/module/fhir2/FhirActivator.java
@@ -80,10 +80,6 @@ public void started() {
 
 	@Override
 	public void willRefreshContext() {
-		if (globalPropertyHolder != null) {
-			Context.getAdministrationService().removeGlobalPropertyListener(globalPropertyHolder);
-		}
-
 		lifecycleListeners.forEach(ModuleLifecycleListener::willRefresh);
 		unloadModules();
 	}
@@ -92,12 +88,11 @@ public void willRefreshContext() {
 	public void contextRefreshed() {
 		if (globalPropertyHolder == null) {
 			globalPropertyHolder = new FhirGlobalPropertyHolder();
+			Context.getAdministrationService().addGlobalPropertyListener(globalPropertyHolder);
 		}
 
 		FhirGlobalPropertyHolder.reset();
 
-		Context.getAdministrationService().addGlobalPropertyListener(globalPropertyHolder);
-
 		if (!started) {
 			return;
 		}
@@ -111,7 +106,6 @@ public void contextRefreshed() {
 	@Override
 	public void willStop() {
 		lifecycleListeners.forEach(ModuleLifecycleListener::willStop);
-		unloadModules();
 
 		if (globalPropertyHolder != null) {
 			Context.getAdministrationService().removeGlobalPropertyListener(globalPropertyHolder);
@@ -121,6 +115,7 @@ public void willStop() {
 	@Override
 	public void stopped() {
 		lifecycleListeners.forEach(ModuleLifecycleListener::stopped);
+		unloadModules();
 
 		globalPropertyHolder = null;
 		started = false;