This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch 2.6.x
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/2.6.x by this push:
new f58997f #2016: merge fix from 2.7.0 to 2.6.x (#2680)
f58997f is described below
commit f58997f4aa334d89dca38fe5087f42e71daa0ab6
Author: Ian Luo <[email protected]>
AuthorDate: Wed Oct 24 13:57:21 2018 +0800
#2016: merge fix from 2.7.0 to 2.6.x (#2680)
---
.../main/java/com/alibaba/dubbo/rpc/protocol/AbstractInvoker.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git
a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/AbstractInvoker.java
b/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/AbstractInvoker.java
index 2e4980b..4ab44b7 100644
---
a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/AbstractInvoker.java
+++
b/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/AbstractInvoker.java
@@ -124,11 +124,12 @@ public abstract class AbstractInvoker<T> implements
Invoker<T> {
@Override
public Result invoke(Invocation inv) throws RpcException {
+ // if invoker is destroyed due to address refresh from registry, let's
allow the current invoke to proceed
if (destroyed.get()) {
- throw new RpcException("Rpc invoker for service " + this + " on
consumer " + NetUtils.getLocalHost()
- + " use dubbo version " + Version.getVersion()
- + " is DESTROYED, can not be invoked any more!");
+ logger.warn("Invoker for service " + this + " on consumer " +
NetUtils.getLocalHost() + " is destroyed, "
+ + ", dubbo version is " + Version.getVersion() + ", this
invoker should not be used any longer");
}
+
RpcInvocation invocation = (RpcInvocation) inv;
invocation.setInvoker(this);
if (attachment != null && attachment.size() > 0) {
