Personal-Twin/hapi-fhir-jpaserver-starter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow properties with a default value to be overridden by an environment variable, to be consistent with the handling of properties without a default value

Browse Source
This commit is contained in:
Jasen Schremmer
2020-01-28 13:13:13 +11:00
parent 3a521c0ee0
commit 54120f374e
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/ca/uhn/fhir/jpa/starter/HapiProperties.java
View File

@@ -178,14 +178,10 @@ public class HapiProperties {
} }
private static String getProperty(String propertyName, String defaultValue) { private static String getProperty(String propertyName, String defaultValue) {
Properties properties = HapiProperties.getProperties(); String value = getProperty(propertyName);
if (properties != null) { if (value != null && value.length() > 0) {
String value = properties.getProperty(propertyName); return value;
if (value != null && value.length() > 0) {
return value;
}
} }
return defaultValue; return defaultValue;