From a04333b393dd09fed27b29883fe4075f3598cdb8 Mon Sep 17 00:00:00 2001
From: Michael Hirsch <michael.hirsch@bosch-si.com>
Date: Mon, 25 Jul 2016 13:30:58 +0200
Subject: [PATCH] re-insert the method cleanMessageHeaderProperties

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
---
 .../java/org/eclipse/hawkbit/amqp/BaseAmqpService.java | 10 ++++++++++
 1 file changed, 10 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 1d9693ed7..b9314ac27 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
@@ -107,4 +107,14 @@ public class BaseAmqpService {
     protected RabbitTemplate getRabbitTemplate() {
         return rabbitTemplate;
     }
+
+    /**
+     * Clean message properties before sending a message.
+     * 
+     * @param message
+     *            the message to cleaned up
+     */
+    protected void cleanMessageHeaderProperties(final Message message) {
+        message.getMessageProperties().getHeaders().remove(AbstractJavaTypeMapper.DEFAULT_CLASSID_FIELD_NAME);
+    }
 }