[incubator-dubbo] branch master updated: remove author info from #1453

[li...@apache.org]

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/incubator-dubbo.git


The following commit(s) were added to refs/heads/master by this push:
     new 5856d4f  remove author info from #1453
5856d4f is described below

commit 5856d4f0631b65aa9adcd2e88c065bbc7a3a8ee2
Author: ken.lj <ke...@gmail.com>
AuthorDate: Tue Jun 5 16:02:55 2018 +0800

    remove author info from #1453
---
 .../main/java/com/alibaba/dubbo/rpc/protocol/AbstractInvoker.java  | 7 +++----
 1 file changed, 3 insertions(+), 4 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 2d8c8d9..dd5c158 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
@@ -134,16 +134,15 @@ public abstract class AbstractInvoker<T> implements Invoker<T> {
         if (attachment != null && attachment.size() > 0) {
             invocation.addAttachmentsIfAbsent(attachment);
         }
-        Map<String, String> context = RpcContext.getContext().getAttachments();
-        if (context != null) {
+        Map<String, String> contextAttachments = RpcContext.getContext().getAttachments();
+        if (contextAttachments != null) {
             /**
              * invocation.addAttachmentsIfAbsent(context){@link RpcInvocation#addAttachmentsIfAbsent(Map)}should not be used here,
              * because the {@link RpcContext#setAttachment(String, String)} is passed in the Filter when the call is triggered
              * by the built-in retry mechanism of the Dubbo. The attachment to update RpcContext will no longer work, which is
              * a mistake in most cases (for example, through Filter to RpcContext output traceId and spanId and other information).
-             * yizhenqiang 20180310
              */
-            invocation.addAttachments(context);
+            invocation.addAttachments(contextAttachments);
         }
         if (getUrl().getMethodParameter(invocation.getMethodName(), Constants.ASYNC_KEY, false)) {
             invocation.setAttachment(Constants.ASYNC_KEY, Boolean.TRUE.toString());

-- 
To stop receiving notification emails like this one, please contact
liujun@apache.org.