You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2021/11/25 06:20:17 UTC

[dubbo] 31/45: disable merged bean definition of reference bean

This is an automated email from the ASF dual-hosted git repository.

liujun pushed a commit to branch release/3.0.14-rpccontext-bugfix
in repository https://gitbox.apache.org/repos/asf/dubbo.git

commit 3279dd1f43abda92139d2c4906d6d6cc4f0e907f
Author: 赫炎 <de...@alibaba-inc.com>
AuthorDate: Tue Dec 15 21:33:03 2020 +0800

    disable merged bean definition of reference bean
---
 .../spring/beans/factory/config/DubboConfigBeanPostProcessor.java  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/config/DubboConfigBeanPostProcessor.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/config/DubboConfigBeanPostProcessor.java
index d19511c..4e6dfac 100644
--- a/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/config/DubboConfigBeanPostProcessor.java
+++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/config/DubboConfigBeanPostProcessor.java
@@ -112,6 +112,13 @@ public class DubboConfigBeanPostProcessor implements BeanDefinitionRegistryPostP
             BeanDefinition beanDefinition = registry.getBeanDefinition(beanName);
             if (className.equals(beanDefinition.getBeanClassName())) {
                 ((AbstractBeanDefinition)beanDefinition).setAbstract(true);
+                //set abstractFlag of mergedBeanDefinitions
+                if (this.beanFactory != null) {
+                    BeanDefinition mergedBeanDefinition = this.beanFactory.getMergedBeanDefinition(beanName);
+                    if (mergedBeanDefinition != null) {
+                        ((AbstractBeanDefinition)mergedBeanDefinition).setAbstract(true);
+                    }
+                }
             }
         }
     }