From f42fbe32b37c0bfe08313a43ebcbe8308e9a80d9 Mon Sep 17 00:00:00 2001
From: SirWayne <dennis.melzer@bosch-si.com>
Date: Wed, 17 Feb 2016 15:16:24 +0100
Subject: [PATCH] Add null check in convert methode

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
---
 .../main/java/org/eclipse/hawkbit/amqp/BaseAmqpService.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/BaseAmqpService.java b/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/BaseAmqpService.java
index f7702e3a6..c3811626e 100644
--- a/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/BaseAmqpService.java
+++ b/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/BaseAmqpService.java
@@ -47,6 +47,9 @@ public class BaseAmqpService {
      */
     @SuppressWarnings("unchecked")
     protected <T> T convertMessage(final Message message, final Class<T> clazz) {
+        if (message == null) {
+            return null;
+        }
         message.getMessageProperties().getHeaders().put(AbstractJavaTypeMapper.DEFAULT_CLASSID_FIELD_NAME,
                 clazz.getTypeName());
         return (T) messageConverter.fromMessage(message);