[skywalking] branch master updated: #4907 - Duplicate Spring MVC endpoint fix (#5084)

[wusheng]

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 e356da4  #4907 - Duplicate Spring MVC endpoint fix (#5084)
e356da4 is described below

commit e356da4b0e264a7617b3356febe6d6e25361f20a
Author: Brandon Fergerson <fergerso...@gmail.com>
AuthorDate: Wed Jul 15 09:52:46 2020 +0400

    #4907 - Duplicate Spring MVC endpoint fix (#5084)
---
 .../spring/mvc/commons/interceptor/AbstractMethodInterceptor.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/AbstractMethodInterceptor.java
 
b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/AbstractMethodInterceptor.java
index d601067..669d2e8 100644
--- 
a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/AbstractMethodInterceptor.java
+++ 
b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/commons/interceptor/AbstractMethodInterceptor.java
@@ -84,9 +84,9 @@ public abstract class AbstractMethodInterceptor implements 
InstanceMethodsAround
             if (requestURL == null) {
                 requestURL = getRequestURL(method);
                 pathMappingCache.addPathMapping(method, requestURL);
-                requestURL = getAcceptedMethodTypes(method) + 
pathMappingCache.findPathMapping(method);
+                requestURL = pathMappingCache.findPathMapping(method);
             }
-            operationName = requestURL;
+            operationName = getAcceptedMethodTypes(method) + requestURL;
         }
 
         HttpServletRequest request = (HttpServletRequest) 
ContextManager.getRuntimeContext()