From fb2d7d554c942118d6e42a4f77b1a4e869a9eb99 Mon Sep 17 00:00:00 2001
From: zhangxin10 <curtain.xin@gmail.com>
Date: Tue, 8 Dec 2015 15:29:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B2=A1=E6=9C=89=E5=AF=B9tr?=
 =?UTF-8?q?acingName=E5=9C=A8Header=E7=9A=84Parameter=E5=88=A4=E7=A9=BA?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4NullPointException?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugin/web/SkyWalkingFilter.java          | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/skywalking-sdk-plugin/web-plugin/src/main/java/com/ai/cloud/skywalking/plugin/web/SkyWalkingFilter.java b/skywalking-sdk-plugin/web-plugin/src/main/java/com/ai/cloud/skywalking/plugin/web/SkyWalkingFilter.java
index 274ea0d39..b486841d9 100644
--- a/skywalking-sdk-plugin/web-plugin/src/main/java/com/ai/cloud/skywalking/plugin/web/SkyWalkingFilter.java
+++ b/skywalking-sdk-plugin/web-plugin/src/main/java/com/ai/cloud/skywalking/plugin/web/SkyWalkingFilter.java
@@ -27,17 +27,20 @@ public class SkyWalkingFilter implements Filter {
         try {
             HttpServletRequest request = (HttpServletRequest) servletRequest;
             String tracingHeaderValue = request.getHeader(tracingName);
-            String contextDataStr = null;
-            int index = tracingHeaderValue.indexOf("=");
-            if (index > 0) {
-                String key = tracingHeaderValue.substring(0, index);
-                if (secondKey.equals(key)) {
-                    contextDataStr = tracingHeaderValue.substring(index + 1);
-                }
-            }
             ContextData contextData = null;
-            if (contextDataStr != null && contextDataStr.length() > 0) {
-                contextData = new ContextData(contextDataStr);
+            if (tracingHeaderValue != null) {
+                String contextDataStr = null;
+                int index = tracingHeaderValue.indexOf("=");
+                if (index > 0) {
+                    String key = tracingHeaderValue.substring(0, index);
+                    if (secondKey.equals(key)) {
+                        contextDataStr = tracingHeaderValue.substring(index + 1);
+                    }
+                }
+
+                if (contextDataStr != null && contextDataStr.length() > 0) {
+                    contextData = new ContextData(contextDataStr);
+                }
             }
             receiver = new RPCBuriedPointReceiver();
             receiver.beforeReceived(contextData, generateIdentification(request));