fix 并行调用多例Bean时 annotationWrapper 导致的线程安全问题

sofastack · Dec 24, 2024 · 2d7d345 · 2d7d345
1 parent 8c5adac
commit 2d7d345
Showing 1 changed file with 21 additions and 11 deletions.
diff --git a/...ot/src/main/java/com/alipay/sofa/runtime/spring/ReferenceAnnotationBeanPostProcessor.java b/...ot/src/main/java/com/alipay/sofa/runtime/spring/ReferenceAnnotationBeanPostProcessor.java
@@ -56,18 +56,18 @@
 public class ReferenceAnnotationBeanPostProcessor implements BeanPostProcessor,
                                                  ApplicationContextAware, PriorityOrdered {
 
-    private static final Logger              LOGGER = SofaBootLoggerFactory
-                                                        .getLogger(ReferenceAnnotationBeanPostProcessor.class);
+    private static final Logger                                 LOGGER            = SofaBootLoggerFactory
+                                                                                      .getLogger(ReferenceAnnotationBeanPostProcessor.class);
 
-    private final SofaRuntimeContext         sofaRuntimeContext;
+    private final SofaRuntimeContext                            sofaRuntimeContext;
 
-    private final BindingAdapterFactory      bindingAdapterFactory;
+    private final BindingAdapterFactory                         bindingAdapterFactory;
 
-    private final BindingConverterFactory    bindingConverterFactory;
+    private final BindingConverterFactory                       bindingConverterFactory;
 
-    private ApplicationContext               applicationContext;
+    private ApplicationContext                                  applicationContext;
 
-    private AnnotationWrapper<SofaReference> annotationWrapper;
+    private final ThreadLocal<AnnotationWrapper<SofaReference>> annotationWrapper = new ThreadLocal<>();
 
     /**
      * To construct a ReferenceAnnotationBeanPostProcessor via a Spring Bean
@@ -97,7 +97,12 @@ private void processSofaReference(final Object bean, String beanName) {
                 return;
             }
 
-            sofaReferenceAnnotation = annotationWrapper.wrap(sofaReferenceAnnotation);
+            if (annotationWrapper.get() == null) {
+                annotationWrapper.set(AnnotationWrapper.create(SofaReference.class)
+                        .withEnvironment(applicationContext.getEnvironment())
+                        .withBinder(DefaultPlaceHolderBinder.INSTANCE));
+            }
+            sofaReferenceAnnotation = annotationWrapper.get().wrap(sofaReferenceAnnotation);
 
             Class<?> interfaceType = sofaReferenceAnnotation.interfaceType();
             if (interfaceType.equals(void.class)) {
@@ -130,7 +135,12 @@ private void processSofaReference(final Object bean, String beanName) {
                 return;
             }
 
-            sofaReferenceAnnotation = annotationWrapper.wrap(sofaReferenceAnnotation);
+            if (annotationWrapper.get() == null) {
+                annotationWrapper.set(AnnotationWrapper.create(SofaReference.class)
+                        .withEnvironment(applicationContext.getEnvironment())
+                        .withBinder(DefaultPlaceHolderBinder.INSTANCE));
+            }
+            sofaReferenceAnnotation = annotationWrapper.get().wrap(sofaReferenceAnnotation);
 
             Class<?> interfaceType = sofaReferenceAnnotation.interfaceType();
             if (interfaceType.equals(void.class)) {
@@ -182,8 +192,8 @@ public int getOrder() {
     @Override
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
         this.applicationContext = applicationContext;
-        this.annotationWrapper = AnnotationWrapper.create(SofaReference.class)
+        this.annotationWrapper.set(AnnotationWrapper.create(SofaReference.class)
             .withEnvironment(applicationContext.getEnvironment())
-            .withBinder(DefaultPlaceHolderBinder.INSTANCE);
+            .withBinder(DefaultPlaceHolderBinder.INSTANCE));
     }
 }