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

albumenj 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 b9230c2  add invocation null check at decode(Channel, InputStream) 
(#8812)
b9230c2 is described below

commit b9230c29113071a4cc4fb09cb516c90b1d360346
Author: zrlw <[email protected]>
AuthorDate: Mon Sep 20 23:11:13 2021 +0800

    add invocation null check at decode(Channel, InputStream) (#8812)
---
 .../java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcResult.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcResult.java
 
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcResult.java
index b8336c7..8791e28 100644
--- 
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcResult.java
+++ 
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcResult.java
@@ -82,7 +82,7 @@ public class DecodeableRpcResult extends AppResponse 
implements Codec, Decodeabl
         }
 
         // switch TCCL
-        if (invocation.getServiceModel() != null) {
+        if (invocation != null && invocation.getServiceModel() != null) {
             
Thread.currentThread().setContextClassLoader(invocation.getServiceModel().getClassLoader());
         }
         ObjectInput in = CodecSupport.getSerialization(channel.getUrl(), 
serializationType)

Reply via email to