You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2020/03/10 01:49:58 UTC
[dubbo] branch 2.7.6-release updated (75218a9 -> 88e5206)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a change to branch 2.7.6-release
in repository https://gitbox.apache.org/repos/asf/dubbo.git.
from 75218a9 add 2.7.6 release note
new 5a6a543 call onThrowable when RPC call fail (#5828)
new b4999d4 polish code of DubboShutdownHook (#5835)
new 28e7378 Fix stub proxy does not work cause of ProxyFactory.getProxy change (#5838)
new 88e5206 fix #5837 (#5839)
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/dubbo/config/DubboShutdownHook.java | 4 ++--
.../dubbo/registry/integration/RegistryDirectory.java | 2 +-
.../dubbo/rpc/proxy/wrapper/StubProxyFactoryWrapper.java | 15 ++++++++-------
.../dubbo/rpc/protocol/dubbo/filter/FutureFilter.java | 2 +-
4 files changed, 12 insertions(+), 11 deletions(-)
[dubbo] 04/04: fix #5837 (#5839)
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 2.7.6-release
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 88e52067774526637b1da973b60583607172f544
Author: qinliujie <li...@alibaba-inc.com>
AuthorDate: Mon Mar 9 17:45:21 2020 +0800
fix #5837 (#5839)
---
.../java/org/apache/dubbo/registry/integration/RegistryDirectory.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
index 5790690..736108f 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
@@ -141,7 +141,7 @@ public class RegistryDirectory<T> extends AbstractDirectory<T> implements Notify
}
shouldRegister = !ANY_VALUE.equals(url.getServiceInterface()) && url.getParameter(REGISTER_KEY, true);
- shouldSimplified = !url.getParameter(SIMPLIFIED_KEY, false);
+ shouldSimplified = url.getParameter(SIMPLIFIED_KEY, false);
if (url.getServiceKey() == null || url.getServiceKey().length() == 0) {
throw new IllegalArgumentException("registry serviceKey is null.");
}
[dubbo] 03/04: Fix stub proxy does not work cause of
ProxyFactory.getProxy change (#5838)
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 2.7.6-release
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 28e737880ce70acb0339100a58512425cfb11fe7
Author: qinliujie <li...@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
[dubbo] 02/04: polish code of DubboShutdownHook (#5835)
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 2.7.6-release
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit b4999d4124372ebb81aa9dd2f7019dcdd211d2ef
Author: tswstarplanet <ts...@apache.org>
AuthorDate: Sun Mar 8 00:19:27 2020 +0800
polish code of DubboShutdownHook (#5835)
---
.../src/main/java/org/apache/dubbo/config/DubboShutdownHook.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/DubboShutdownHook.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/DubboShutdownHook.java
index 50f2011..56dab50 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/DubboShutdownHook.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/DubboShutdownHook.java
@@ -89,7 +89,7 @@ public class DubboShutdownHook extends Thread {
* Register the ShutdownHook
*/
public void register() {
- if (!registered.get() && registered.compareAndSet(false, true)) {
+ if (registered.compareAndSet(false, true)) {
DubboShutdownHook dubboShutdownHook = getDubboShutdownHook();
Runtime.getRuntime().addShutdownHook(dubboShutdownHook);
dispatch(new DubboShutdownHookRegisteredEvent(dubboShutdownHook));
@@ -100,7 +100,7 @@ public class DubboShutdownHook extends Thread {
* Unregister the ShutdownHook
*/
public void unregister() {
- if (registered.get() && registered.compareAndSet(true, false)) {
+ if (registered.compareAndSet(true, false)) {
DubboShutdownHook dubboShutdownHook = getDubboShutdownHook();
Runtime.getRuntime().removeShutdownHook(dubboShutdownHook);
dispatch(new DubboShutdownHookUnregisteredEvent(dubboShutdownHook));
[dubbo] 01/04: call onThrowable when RPC call fail (#5828)
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 2.7.6-release
in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 5a6a54335abfd5964858a7a698a264e6527858a4
Author: Haiyang <ha...@163.com>
AuthorDate: Wed Mar 4 16:29:56 2020 +0800
call onThrowable when RPC call fail (#5828)
fixes #5827
---
.../java/org/apache/dubbo/rpc/protocol/dubbo/filter/FutureFilter.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/filter/FutureFilter.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/filter/FutureFilter.java
index 1b2ac93..ee922af 100644
--- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/filter/FutureFilter.java
+++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/filter/FutureFilter.java
@@ -62,7 +62,7 @@ public class FutureFilter implements Filter, Filter.Listener {
@Override
public void onError(Throwable t, Invoker<?> invoker, Invocation invocation) {
-
+ fireThrowCallback(invoker, invocation, t);
}
private void fireInvokeCallback(final Invoker<?> invoker, final Invocation invocation) {