[dubbo] branch master updated: Fix stub proxy does not work cause of ProxyFactory.getProxy change (#5838)

[liujun]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 5297133  Fix stub proxy does not work cause of ProxyFactory.getProxy 
change (#5838)
5297133 is described below

commit 529713305fc7807dd1600f18199ff4e7442f955f
Author: qinliujie <liujie....@alibaba-inc.com>
AuthorDate: Mon Mar 9 17:42:31 2020 +0800

    Fix stub proxy does not work cause of ProxyFactory.getProxy change (#5838)
    
    fix #5836
---
 .../dubbo/rpc/proxy/wrapper/StubProxyFactoryWrapper.java  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/wrapper/StubProxyFactoryWrapper.java
 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/wrapper/StubProxyFactoryWrapper.java
index de159f6..414295a 100644
--- 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/wrapper/StubProxyFactoryWrapper.java
+++ 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/wrapper/StubProxyFactoryWrapper.java
@@ -63,13 +63,7 @@ public class StubProxyFactoryWrapper implements ProxyFactory 
{
 
     @Override
     public <T> T getProxy(Invoker<T> invoker, boolean generic) throws 
RpcException {
-        return proxyFactory.getProxy(invoker, generic);
-    }
-
-    @Override
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    public <T> T getProxy(Invoker<T> invoker) throws RpcException {
-        T proxy = proxyFactory.getProxy(invoker);
+        T proxy = proxyFactory.getProxy(invoker, generic);
         if (GenericService.class != invoker.getInterface()) {
             URL url = invoker.getUrl();
             String stub = url.getParameter(STUB_KEY, 
url.getParameter(LOCAL_KEY));
@@ -111,6 +105,13 @@ public class StubProxyFactoryWrapper implements 
ProxyFactory {
             }
         }
         return proxy;
+
+    }
+
+    @Override
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public <T> T getProxy(Invoker<T> invoker) throws RpcException {
+        return getProxy(invoker, false);
     }
 
     @Override