mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-06-16 17:55:15 +00:00
[ACS-5935] Revert change.
This commit is contained in:
parent
71df1b01e2
commit
ddf14c7e31
@ -100,7 +100,7 @@ public class HttpClientConfig
|
||||
Map<String, String> resultProperties = getHttpClientPropertiesForService(properties);
|
||||
Map<String, String> systemProperties = getHttpClientPropertiesForService(System.getProperties());
|
||||
|
||||
resultProperties.putAll(systemProperties); //Override/Add to Global Properties results with values from System Properties
|
||||
systemProperties.forEach((k, v) -> resultProperties.put(k, v)); //Override/Add to Global Properties results with values from System Properties
|
||||
|
||||
return resultProperties;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user