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

sofastack · Dec 24, 2024 · 2b80268 · 2b80268
1 parent 2d7d345
commit 2b80268
Showing 1 changed file with 9 additions and 9 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
@@ -98,9 +98,7 @@ private void processSofaReference(final Object bean, String beanName) {
             }
 
             if (annotationWrapper.get() == null) {
-                annotationWrapper.set(AnnotationWrapper.create(SofaReference.class)
-                        .withEnvironment(applicationContext.getEnvironment())
-                        .withBinder(DefaultPlaceHolderBinder.INSTANCE));
+                annotationWrapper.set(createAnnotationWrapper());
             }
             sofaReferenceAnnotation = annotationWrapper.get().wrap(sofaReferenceAnnotation);
 
@@ -136,9 +134,7 @@ private void processSofaReference(final Object bean, String beanName) {
             }
 
             if (annotationWrapper.get() == null) {
-                annotationWrapper.set(AnnotationWrapper.create(SofaReference.class)
-                        .withEnvironment(applicationContext.getEnvironment())
-                        .withBinder(DefaultPlaceHolderBinder.INSTANCE));
+                annotationWrapper.set(createAnnotationWrapper());
             }
             sofaReferenceAnnotation = annotationWrapper.get().wrap(sofaReferenceAnnotation);
 
@@ -192,8 +188,12 @@ public int getOrder() {
     @Override
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
         this.applicationContext = applicationContext;
-        this.annotationWrapper.set(AnnotationWrapper.create(SofaReference.class)
-            .withEnvironment(applicationContext.getEnvironment())
-            .withBinder(DefaultPlaceHolderBinder.INSTANCE));
+        this.annotationWrapper.set(createAnnotationWrapper());
+    }
+
+    private AnnotationWrapper<SofaReference> createAnnotationWrapper() {
+        return AnnotationWrapper.create(SofaReference.class)
+                .withEnvironment(this.applicationContext.getEnvironment())
+                .withBinder(DefaultPlaceHolderBinder.INSTANCE);
     }
 }