From 58f25ebdc292294b31aececa393fcfa2bda3db02 Mon Sep 17 00:00:00 2001
From: "ken.lj" <ken.lj.hz@gmail.com>
Date: Mon, 7 Mar 2022 16:06:52 +0800
Subject: [PATCH] fix, use server attachment (#9744)

---
 .../java/org/apache/dubbo/config/ReferenceConfigBase.java     | 4 +---
 .../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 f60f5d037f..0daeeeefe1 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 eb6d4ff34e..7235d0fdb2 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);
     }