[dubbo] branch 3.1 updated: fix: executor (#11652)

[albumenj]

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

albumenj pushed a commit to branch 3.1
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.1 by this push:
     new 29d32afd79 fix: executor (#11652)
29d32afd79 is described below

commit 29d32afd79513330f3cd83a78b405b8b33cc6b91
Author: aamingaa <49740762+aamin...@users.noreply.github.com>
AuthorDate: Sat Feb 25 16:43:22 2023 +0800

    fix: executor (#11652)
---
 .../threadpool/manager/DefaultExecutorRepository.java      | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git 
a/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/manager/DefaultExecutorRepository.java
 
b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/manager/DefaultExecutorRepository.java
index 2a0858a2c4..399567f97d 100644
--- 
a/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/manager/DefaultExecutorRepository.java
+++ 
b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/manager/DefaultExecutorRepository.java
@@ -31,7 +31,6 @@ import org.apache.dubbo.config.ModuleConfig;
 import org.apache.dubbo.config.ProviderConfig;
 import org.apache.dubbo.rpc.model.ApplicationModel;
 import org.apache.dubbo.rpc.model.ModuleModel;
-import org.apache.dubbo.rpc.model.ServiceDescriptor;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -47,7 +46,6 @@ import static 
org.apache.dubbo.common.constants.CommonConstants.DEFAULT_EXPORT_T
 import static 
org.apache.dubbo.common.constants.CommonConstants.DEFAULT_PROTOCOL;
 import static 
org.apache.dubbo.common.constants.CommonConstants.DEFAULT_REFER_THREAD_NUM;
 import static 
org.apache.dubbo.common.constants.CommonConstants.EXECUTOR_SERVICE_COMPONENT_KEY;
-import static 
org.apache.dubbo.common.constants.CommonConstants.INTERNAL_EXECUTOR_SERVICE_COMPONENT_KEY;
 import static org.apache.dubbo.common.constants.CommonConstants.SIDE_KEY;
 import static org.apache.dubbo.common.constants.CommonConstants.THREADS_KEY;
 import static 
org.apache.dubbo.common.constants.CommonConstants.THREAD_NAME_KEY;
@@ -122,18 +120,10 @@ public class DefaultExecutorRepository implements 
ExecutorRepository, ExtensionA
      * @return
      */
     private String getExecutorKey(URL url) {
-        String executorKey = INTERNAL_EXECUTOR_SERVICE_COMPONENT_KEY;
-        ServiceDescriptor serviceDescriptor = 
applicationModel.getInternalModule().getServiceRepository().lookupService(url.getServiceInterface());
-        // if not found in internal service repository, then it's biz service 
defined by user.
-        if (serviceDescriptor == null) {
-            executorKey = EXECUTOR_SERVICE_COMPONENT_KEY;
-
-        }
-
         if (CONSUMER_SIDE.equalsIgnoreCase(url.getParameter(SIDE_KEY))) {
-            executorKey = CONSUMER_SHARED_EXECUTOR_SERVICE_COMPONENT_KEY;
+            return CONSUMER_SHARED_EXECUTOR_SERVICE_COMPONENT_KEY;
         }
-        return executorKey;
+        return EXECUTOR_SERVICE_COMPONENT_KEY;
     }
 
     private ExecutorService createExecutor(URL url) {