Merge branch 'master' into master

apache · Aug 20, 2018 · d1c22b5 · d1c22b5
2 parents f938ade + dd942d1
commit d1c22b5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/ForwardInterceptor.java b/...x-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat78x/ForwardInterceptor.java
@@ -37,7 +37,7 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr
         if (ContextManager.isActive()) {
             AbstractSpan abstractTracingSpan = ContextManager.activeSpan();
             Map<String, String> eventMap = new HashMap<String, String>();
-            eventMap.put("forward-url", (String)objInst.getSkyWalkingDynamicField());
+            eventMap.put("forward-url", objInst.getSkyWalkingDynamicField() == null ? "" : String.valueOf(objInst.getSkyWalkingDynamicField()));
             abstractTracingSpan.log(System.currentTimeMillis(), eventMap);
             ContextManager.getRuntimeContext().put(Constants.FORWARD_REQUEST_FLAG, true);
         }