[skywalking] branch master updated: Fix the span cannot stop when forward request (#2820)

[wu...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 3217ff1  Fix the span cannot stop when forward request (#2820)
3217ff1 is described below

commit 3217ff1444a922a9f57fde64e5d73bbd8fcefe5c
Author: Xin,Zhang <nz...@gmail.com>
AuthorDate: Tue Jun 4 17:38:50 2019 +0800

    Fix the span cannot stop when forward request (#2820)
---
 .../org/apache/skywalking/apm/plugin/tomcat78x/ForwardInterceptor.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/ForwardInterceptor.java b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/ForwardInterceptor.java
index 68416c7..4bcc46b 100644
--- a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/ForwardInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/ForwardInterceptor.java
@@ -46,7 +46,7 @@ public class ForwardInterceptor implements InstanceMethodsAroundInterceptor, Ins
     @Override
     public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes,
         Object ret) throws Throwable {
-
+        ContextManager.getRuntimeContext().remove(Constants.FORWARD_REQUEST_FLAG);
         return ret;
     }