ADDR-132: Add and Remove 'Get Global Properties' proxy privilege

openmrs · Mar 6, 2024 · 02608a4 · 02608a4
1 parent 67b5e9d
commit 02608a4
Showing 1 changed file with 18 additions and 11 deletions.
diff --git a/...rc/main/java/org/openmrs/module/addresshierarchy/service/AddressHierarchyServiceImpl.java b/...rc/main/java/org/openmrs/module/addresshierarchy/service/AddressHierarchyServiceImpl.java
@@ -705,19 +705,26 @@ else if (level.getParent() == null){
 	synchronized public void initializeFullAddressCache() {
 
 		// generally, this global property should be set to true; it just allows cache load to be disabled to speed startup
-		Context.addProxyPrivilege("Get Global Properties");
-		if (Context.getAdministrationService().getGlobalProperty(AddressHierarchyConstants.GLOBAL_PROP_INITIALIZE_ADDRESS_HIERARCHY_CACHE_ON_STARTUP).equalsIgnoreCase("true")) {
-
-			// only initialize if necessary (and if we have entries)
-			if ((this.fullAddressCacheInitialized == false || MapUtils.isEmpty(this.fullAddressCache))
-					&& this.getAddressHierarchyEntryCount() > 0) {
-
-				this.fullAddressCache = new HashMap<Locale, Map<String,List<String>> >();
-				Locale locale = i18nCache.getLocaleForFullAddressCache();
-				getAddressesForLocale(locale);
-				this.fullAddressCacheInitialized = true;
+		try {
+			Context.addProxyPrivilege("Get Global Properties");
+			if (Context.getAdministrationService()
+			        .getGlobalProperty(AddressHierarchyConstants.GLOBAL_PROP_INITIALIZE_ADDRESS_HIERARCHY_CACHE_ON_STARTUP)
+			        .equalsIgnoreCase("true")) {
+
+				// only initialize if necessary (and if we have entries)
+				if ((this.fullAddressCacheInitialized == false || MapUtils.isEmpty(this.fullAddressCache))
+				        && this.getAddressHierarchyEntryCount() > 0) {
+
+					this.fullAddressCache = new HashMap<Locale, Map<String, List<String>>>();
+					Locale locale = i18nCache.getLocaleForFullAddressCache();
+					getAddressesForLocale(locale);
+					this.fullAddressCacheInitialized = true;
+				}
 			}
 		}
+		finally {
+			Context.removeProxyPrivilege("Get Global Properties");
+		}
 
 	}