[dubbo] branch 3.0 updated: fix, use server attachment (#9744)

[liujun]

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

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


The following commit(s) were added to refs/heads/3.0 by this push:
     new 58f25eb  fix, use server attachment (#9744)
58f25eb is described below

commit 58f25ebdc292294b31aececa393fcfa2bda3db02
Author: ken.lj <ken.lj...@gmail.com>
AuthorDate: Mon Mar 7 16:06:52 2022 +0800

    fix, use server attachment (#9744)
---
 .../src/main/java/org/apache/dubbo/config/ReferenceConfigBase.java    | 4 +---
 .../main/java/org/apache/dubbo/rpc/proxy/AbstractProxyInvoker.java    | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git 
a/dubbo-common/src/main/java/org/apache/dubbo/config/ReferenceConfigBase.java 
b/dubbo-common/src/main/java/org/apache/dubbo/config/ReferenceConfigBase.java
index f60f5d0..0daeeee 100644
--- 
a/dubbo-common/src/main/java/org/apache/dubbo/config/ReferenceConfigBase.java
+++ 
b/dubbo-common/src/main/java/org/apache/dubbo/config/ReferenceConfigBase.java
@@ -240,9 +240,7 @@ public abstract class ReferenceConfigBase<T> extends 
AbstractReferenceConfig {
         }
         setInterface(interfaceClass == null ? null : interfaceClass.getName());
         this.interfaceClass = interfaceClass;
-        if (getInterfaceClassLoader() == null) {
-            setInterfaceClassLoader(interfaceClass == null ? null : 
interfaceClass.getClassLoader());
-        }
+        setInterfaceClassLoader(interfaceClass == null ? null : 
interfaceClass.getClassLoader());
     }
 
     public String getClient() {
diff --git 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/AbstractProxyInvoker.java
 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/AbstractProxyInvoker.java
index eb6d4ff..7235d0f 100644
--- 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/AbstractProxyInvoker.java
+++ 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/AbstractProxyInvoker.java
@@ -141,7 +141,7 @@ public abstract class AbstractProxyInvoker<T> implements 
Invoker<T> {
             return (CompletableFuture<Object>) value;
         } else if (RpcContext.getServerAttachment().isAsyncStarted()) {
             invocation.put(PROVIDER_ASYNC_KEY, Boolean.TRUE);
-            return ((AsyncContextImpl) 
(RpcContext.getServiceContext().getAsyncContext())).getInternalFuture();
+            return ((AsyncContextImpl) 
(RpcContext.getServerAttachment().getAsyncContext())).getInternalFuture();
         }
         return CompletableFuture.completedFuture(value);
     }