From 562e28e860ee68720d015a7b883c540d66c8cc71 Mon Sep 17 00:00:00 2001 From: zhaoxiaojiebj01 Date: Thu, 22 Sep 2022 14:28:52 +0800 Subject: [PATCH] Overrding all classloaders HA settings by -D params --- .../java/org/hotswap/agent/config/PluginConfiguration.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hotswap-agent-core/src/main/java/org/hotswap/agent/config/PluginConfiguration.java b/hotswap-agent-core/src/main/java/org/hotswap/agent/config/PluginConfiguration.java index 3344c25ce..47db0b243 100644 --- a/hotswap-agent-core/src/main/java/org/hotswap/agent/config/PluginConfiguration.java +++ b/hotswap-agent-core/src/main/java/org/hotswap/agent/config/PluginConfiguration.java @@ -88,6 +88,7 @@ private void loadConfigurationFile() { if (externalPropertiesFile != null) { configurationURL = resourceNameToURL(externalPropertiesFile); properties.load(configurationURL.openStream()); + System.getProperties().forEach((key, value) -> properties.put(key, value)); return; } @@ -162,8 +163,10 @@ private void loadConfigurationFile() { containsPropertyFileDirectly = true; } try { - if (configurationURL != null) + if (configurationURL != null) { properties.load(configurationURL.openStream()); + System.getProperties().forEach((key, value) -> properties.put(key, value)); + } } catch (Exception e) { LOGGER.error("Error while loading 'hotswap-agent.properties' from URL " + configurationURL, e); }