From 2ab1bca5f09318dcd2f84a6809014523a6fda387 Mon Sep 17 00:00:00 2001
From: wochidaxiangchang <47874534+wochidaxiangchang@users.noreply.github.com>
Date: Thu, 8 Jul 2021 16:33:04 +0800
Subject: [PATCH] fix ArthasBootstrap load arthas.properties with
 arthas.config.location/arthas.config.name config (#1852)

---
 .../java/com/taobao/arthas/core/server/ArthasBootstrap.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/com/taobao/arthas/core/server/ArthasBootstrap.java b/core/src/main/java/com/taobao/arthas/core/server/ArthasBootstrap.java
index 9988af069..afe556748 100644
--- 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) {