karaf-decanter git commit: Include bodyType event even if body is not included in the posted event in Decanter Camel Tracer and Event Notifier

[jbonofre]

Repository: karaf-decanter
Updated Branches:
  refs/heads/master 41cdd8998 -> 956b829e5


Include bodyType event even if body is not included in the posted event in 
Decanter Camel Tracer and Event Notifier


Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/956b829e
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/956b829e
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/956b829e

Branch: refs/heads/master
Commit: 956b829e515503654875f395020a0ff627e897bd
Parents: 41cdd89
Author: Jean-Baptiste Onofré <jbono...@apache.org>
Authored: Mon Jul 17 09:57:28 2017 +0200
Committer: Jean-Baptiste Onofré <jbono...@apache.org>
Committed: Mon Jul 17 09:57:28 2017 +0200

----------------------------------------------------------------------
 .../karaf/decanter/collector/camel/DecanterEventNotifier.java    | 4 ++--
 .../decanter/collector/camel/DecanterTraceEventHandler.java      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/956b829e/collector/camel/src/main/java/org/apache/karaf/decanter/collector/camel/DecanterEventNotifier.java
----------------------------------------------------------------------
diff --git 
a/collector/camel/src/main/java/org/apache/karaf/decanter/collector/camel/DecanterEventNotifier.java
 
b/collector/camel/src/main/java/org/apache/karaf/decanter/collector/camel/DecanterEventNotifier.java
index 27d7e07..0f73819 100644
--- 
a/collector/camel/src/main/java/org/apache/karaf/decanter/collector/camel/DecanterEventNotifier.java
+++ 
b/collector/camel/src/main/java/org/apache/karaf/decanter/collector/camel/DecanterEventNotifier.java
@@ -316,16 +316,16 @@ public class DecanterEventNotifier extends 
EventNotifierSupport {
         }
         if (includeBody) {
             data.put("inBody", 
MessageHelper.extractBodyAsString(exchange.getIn()));
-            data.put("inBodyType", 
MessageHelper.getBodyTypeName(exchange.getIn()));
         }
+        data.put("inBodyType", 
MessageHelper.getBodyTypeName(exchange.getIn()));
         if (exchange.hasOut()) {
             if (includeHeaders) {
                 data.put("outHeaders", exchange.getOut().getHeaders());
             }
             if (includeBody) {
                 data.put("outBody", 
MessageHelper.extractBodyAsString(exchange.getOut()));
-                data.put("outBodyType", 
MessageHelper.getBodyTypeName(exchange.getOut()));
             }
+            data.put("outBodyType", 
MessageHelper.getBodyTypeName(exchange.getOut()));
         }
         data.put("causedByException", extractCausedByException(exchange));
         if (extender != null) {

http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/956b829e/collector/camel/src/main/java/org/apache/karaf/decanter/collector/camel/DecanterTraceEventHandler.java
----------------------------------------------------------------------
diff --git 
a/collector/camel/src/main/java/org/apache/karaf/decanter/collector/camel/DecanterTraceEventHandler.java
 
b/collector/camel/src/main/java/org/apache/karaf/decanter/collector/camel/DecanterTraceEventHandler.java
index c7d1b0e..921d2d1 100644
--- 
a/collector/camel/src/main/java/org/apache/karaf/decanter/collector/camel/DecanterTraceEventHandler.java
+++ 
b/collector/camel/src/main/java/org/apache/karaf/decanter/collector/camel/DecanterTraceEventHandler.java
@@ -96,16 +96,16 @@ public class DecanterTraceEventHandler implements 
TraceEventHandler {
         }
         if (includeBody) {
             data.put("inBody", 
MessageHelper.extractBodyAsString(exchange.getIn()));
-            data.put("inBodyType", 
MessageHelper.getBodyTypeName(exchange.getIn()));
         }
+        data.put("inBodyType", 
MessageHelper.getBodyTypeName(exchange.getIn()));
         if (exchange.hasOut()) {
             if (includeHeaders) {
                 data.put("outHeaders", 
exchange.getOut().getHeaders().isEmpty() ? null : 
exchange.getOut().getHeaders());
             }
             if (includeBody) {
                 data.put("outBody", 
MessageHelper.extractBodyAsString(exchange.getOut()));
-                data.put("outBodyType", 
MessageHelper.getBodyTypeName(exchange.getOut()));
             }
+            data.put("outBodyType", 
MessageHelper.getBodyTypeName(exchange.getOut()));œ
         }
         data.put("causedByException", extractCausedByException(exchange));
         if (extender != null) {