Clear the container at the end of the DefaultExecutorRepository#destr…

…oyAll method (#7820) * Clear the container at the end of the DefaultExecutorRepository#destroyAll method * Reuse destroyRegistered variable
apache · May 22, 2021 · 03223c7 · 03223c7
1 parent 22ec5a0
commit 03223c7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/...n/src/main/java/org/apache/dubbo/common/threadpool/manager/DefaultExecutorRepository.java b/...n/src/main/java/org/apache/dubbo/common/threadpool/manager/DefaultExecutorRepository.java
@@ -166,6 +166,8 @@ public void destroyAll() {
                 });
             }
         });
+
+        data.clear();
     }
 
     private ExecutorService createExecutor(URL url) {

diff --git a/.../dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/AbstractRegistry.java b/.../dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/AbstractRegistry.java
@@ -470,7 +470,7 @@ public void destroy() {
         }
         Set<URL> destroyRegistered = new HashSet<>(getRegistered());
         if (!destroyRegistered.isEmpty()) {
-            for (URL url : new HashSet<>(getRegistered())) {
+            for (URL url : new HashSet<>(destroyRegistered)) {
                 if (url.getParameter(DYNAMIC_KEY, true)) {
                     try {
                         unregister(url);