From 3844c2f907b23dd41a1fc626d0fdb20534802d96 Mon Sep 17 00:00:00 2001
From: blackshy <blackshy@qq.com>
Date: Fri, 29 Oct 2021 14:46:40 +0800
Subject: [PATCH] fix user define arthasConfigMap support (#2017)

---
 .../java/com/alibaba/arthas/spring/ArthasConfiguration.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arthas-spring-boot-starter/src/main/java/com/alibaba/arthas/spring/ArthasConfiguration.java b/arthas-spring-boot-starter/src/main/java/com/alibaba/arthas/spring/ArthasConfiguration.java
index 23f4e716e..3194b6f46 100644
--- a/arthas-spring-boot-starter/src/main/java/com/alibaba/arthas/spring/ArthasConfiguration.java
+++ b/arthas-spring-boot-starter/src/main/java/com/alibaba/arthas/spring/ArthasConfiguration.java
@@ -36,7 +36,7 @@ public class ArthasConfiguration {
 	 * </pre>
 	 */
 	@ConfigurationProperties(prefix = "arthas")
-	@ConditionalOnMissingBean
+	@ConditionalOnMissingBean(name="arthasConfigMap")
 	@Bean
 	public HashMap<String, String> arthasConfigMap() {
 		return new HashMap<String, String>();
@@ -44,7 +44,7 @@ public class ArthasConfiguration {
 
 	@ConditionalOnMissingBean
 	@Bean
-	public ArthasAgent arthasAgent(@Autowired Map<String, String> arthasConfigMap,
+	public ArthasAgent arthasAgent(@Autowired @Qualifier("arthasConfigMap") Map<String, String> arthasConfigMap,
 			@Autowired ArthasProperties arthasProperties) throws Throwable {
         arthasConfigMap = StringUtils.removeDashKey(arthasConfigMap);
         ArthasProperties.updateArthasConfigMapDefaultValue(arthasConfigMap);