Sync when destroy (apache#11783)

zzz-zkr001 · Mar 10, 2023 · ba14a20 · ba14a20
1 parent d0a1bd0
commit ba14a20
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ScopeModel.java b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ScopeModel.java
@@ -110,21 +110,23 @@ protected void initialize() {
     }
 
     public void destroy() {
-        if (destroyed.compareAndSet(false, true)) {
-            try {
-                onDestroy();
-                HashSet<ClassLoader> copyOfClassLoaders = new HashSet<>(classLoaders);
-                for (ClassLoader classLoader : copyOfClassLoaders) {
-                    removeClassLoader(classLoader);
-                }
-                if (beanFactory != null) {
-                    beanFactory.destroy();
-                }
-                if (extensionDirector != null) {
-                    extensionDirector.destroy();
+        synchronized (instLock) {
+            if (destroyed.compareAndSet(false, true)) {
+                try {
+                    onDestroy();
+                    HashSet<ClassLoader> copyOfClassLoaders = new HashSet<>(classLoaders);
+                    for (ClassLoader classLoader : copyOfClassLoaders) {
+                        removeClassLoader(classLoader);
+                    }
+                    if (beanFactory != null) {
+                        beanFactory.destroy();
+                    }
+                    if (extensionDirector != null) {
+                        extensionDirector.destroy();
+                    }
+                } catch (Throwable t) {
+                    LOGGER.error(CONFIG_UNABLE_DESTROY_MODEL, "", "", "Error happened when destroying ScopeModel.", t);
                 }
-            } catch (Throwable t) {
-                LOGGER.error(CONFIG_UNABLE_DESTROY_MODEL, "", "", "Error happened when destroying ScopeModel.", t);
             }
         }
     }