[dubbo] branch 3.0 updated: fix MergeableClusterInvoker NPE (#8891)

[albumenj]

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 9ecb955  fix MergeableClusterInvoker NPE (#8891)
9ecb955 is described below

commit 9ecb955b9490b8c14df0773143e4f130f84e9418
Author: Wang Chengming <634749...@qq.com>
AuthorDate: Fri Sep 24 19:04:18 2021 +0800

    fix MergeableClusterInvoker NPE (#8891)
---
 .../org/apache/dubbo/rpc/cluster/support/MergeableClusterInvoker.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/MergeableClusterInvoker.java
 
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/MergeableClusterInvoker.java
index 3ef72a3..315596c 100644
--- 
a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/MergeableClusterInvoker.java
+++ 
b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/MergeableClusterInvoker.java
@@ -127,9 +127,9 @@ public class MergeableClusterInvoker<T> extends 
AbstractClusterInvoker<T> {
             Method method;
             try {
                 method = returnType.getMethod(merger, returnType);
-            } catch (NoSuchMethodException e) {
+            } catch (NoSuchMethodException | NullPointerException e) {
                 throw new RpcException("Can not merge result because missing 
method [ " + merger + " ] in class [ " +
-                        returnType.getName() + " ]");
+                    returnType.getName() + " ]");
             }
             if (!Modifier.isPublic(method.getModifiers())) {
                 method.setAccessible(true);