Fix #4152

`beanFactory.isTypeMatch` may lead to the initialization of FactoryBean, dubbo consumer is a ReferenceBean which implements FactoryBean. related to #2328 #3865
apolloconfig · Dec 17, 2021 · eb5ae59 · eb5ae59
1 parent 501e4b9
commit eb5ae59
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/spring/util/BeanRegistrationUtil.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/spring/util/BeanRegistrationUtil.java
@@ -19,10 +19,11 @@
 import java.util.Map;
 import java.util.Objects;
 
-import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.core.type.MethodMetadata;
 
 /**
  * @author Jason Song(song_s@ctrip.com)
@@ -41,17 +42,15 @@ public static boolean registerBeanDefinitionIfNotExists(BeanDefinitionRegistry r
 
     String[] candidates = registry.getBeanDefinitionNames();
 
-    if (registry instanceof BeanFactory) {
-      final BeanFactory beanFactory = (BeanFactory) registry;
-      for (String candidate : candidates) {
-        if (beanFactory.isTypeMatch(candidate, beanClass)) {
-          return false;
-        }
+    for (String candidate : candidates) {
+      BeanDefinition beanDefinition = registry.getBeanDefinition(candidate);
+      if (Objects.equals(beanDefinition.getBeanClassName(), beanClass.getName())) {
+        return false;
       }
-    } else {
-      for (String candidate : candidates) {
-        BeanDefinition beanDefinition = registry.getBeanDefinition(candidate);
-        if (Objects.equals(beanDefinition.getBeanClassName(), beanClass.getName())) {
+
+      if (beanDefinition instanceof AnnotatedBeanDefinition) {
+        MethodMetadata metadata = ((AnnotatedBeanDefinition) beanDefinition).getFactoryMethodMetadata();
+        if (metadata != null && Objects.equals(metadata.getReturnTypeName(), beanClass.getName())) {
           return false;
         }
       }

diff --git a/pom.xml b/pom.xml
@@ -56,7 +56,7 @@
 	</issueManagement>
 
 	<properties>
-		<revision>1.9.1</revision>
+		<revision>1.9.2-SNAPSHOT</revision>
 		<java.version>1.8</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<spring-boot.version>2.4.2</spring-boot.version>