fix ArthasBootstrap load arthas.properties with arthas.config.location/arthas.config.name config (#1852)

4 years ago · 2ab1bca5f0
parent 6bb360e9bc
commit 2ab1bca5f0
1 changed files with 2 additions and 2 deletions
--- a/core/src/main/java/com/taobao/arthas/core/server/ArthasBootstrap.java
+++ b/core/src/main/java/com/taobao/arthas/core/server/ArthasBootstrap.java
@ -299,7 +299,7 @@ public class ArthasBootstrap {
        String location = null;

        if (arthasEnvironment.containsProperty(CONFIG_LOCATION_PROPERTY)) {
-            location = arthasEnvironment.resolvePlaceholders(CONFIG_LOCATION_PROPERTY);
+            location = arthasEnvironment.resolvePlaceholders(arthasEnvironment.getProperty(CONFIG_LOCATION_PROPERTY));
        }

        if (location == null) {
@ -308,7 +308,7 @@ public class ArthasBootstrap {

        String configName = "arthas";
        if (arthasEnvironment.containsProperty(CONFIG_NAME_PROPERTY)) {
-            configName = arthasEnvironment.resolvePlaceholders(CONFIG_NAME_PROPERTY);
+            configName = arthasEnvironment.resolvePlaceholders(arthasEnvironment.getProperty(CONFIG_NAME_PROPERTY));
        }

        if (location != null) {