From 5856d4f0631b65aa9adcd2e88c065bbc7a3a8ee2 Mon Sep 17 00:00:00 2001 From: "ken.lj" Date: Tue, 5 Jun 2018 16:02:55 +0800 Subject: [PATCH] remove author info from #1453 --- .../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 2d8c8d9b8ec..dd5c158e332 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 Result invoke(Invocation inv) throws RpcException { if (attachment != null && attachment.size() > 0) { invocation.addAttachmentsIfAbsent(attachment); } - Map context = RpcContext.getContext().getAttachments(); - if (context != null) { + Map 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());