From a0ef72cf8b7f482d4a8bfa497a33f7306855512e Mon Sep 17 00:00:00 2001
From: Wilt <15779229872@163.com>
Date: Thu, 11 Apr 2019 14:22:02 +0800
Subject: [PATCH] Fixed Failure of Enhanced Kafka Interceptor to Acquire
 SkyWalking DynamicField (#2470)

---
 .../skywalking/apm/plugin/kafka/v1/CallbackInterceptor.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/CallbackInterceptor.java b/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/CallbackInterceptor.java
index 3d3f38e9a..8e38bd943 100644
--- a/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/CallbackInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/v1/CallbackInterceptor.java
@@ -34,7 +34,9 @@ public class CallbackInterceptor implements InstanceMethodsAroundInterceptor {
 
         //Get the SnapshotContext
         ContextSnapshot contextSnapshot = (ContextSnapshot)objInst.getSkyWalkingDynamicField();
-        ContextManager.continued(contextSnapshot);
+        if (null != contextSnapshot) {
+            ContextManager.continued(contextSnapshot);
+        }
     }
 
     @Override