From ea566b19a501b44c29ca4083c28c560160ad86cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E7=8E=89=E6=A1=94?= <769213327@qq.com>
Date: Fri, 5 Apr 2019 09:52:33 +0800
Subject: [PATCH] Fix RabbitMq NPE case (#2450)

* Fix npe
---
 .../apm/plugin/rabbitmq/RabbitMQConsumerInterceptor.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQConsumerInterceptor.java b/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQConsumerInterceptor.java
index 2132fa33b..91be8bb7f 100644
--- a/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQConsumerInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/rabbitmq-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/rabbitmq/RabbitMQConsumerInterceptor.java
@@ -51,7 +51,11 @@ public class RabbitMQConsumerInterceptor implements InstanceMethodsAroundInterce
         CarrierItem next = contextCarrier.items();
         while (next.hasNext()) {
             next = next.next();
-            next.setHeadValue(properties.getHeaders().get(next.getHeadKey()).toString());
+            if (properties.getHeaders() != null && properties.getHeaders().get(next.getHeadKey()) != null) {
+                next.setHeadValue(properties.getHeaders().get(next.getHeadKey()).toString());
+            } else {
+                next.setHeadValue("");
+            }
         }
         ContextManager.extract(contextCarrier);