[camel] branch master updated: Revert a change in latest dataformat related commit

[gnodet]

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 817015f  Revert a change in latest dataformat related commit
817015f is described below

commit 817015f9ab93e583ede296c8e896dfa5b190ce40
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri Apr 26 11:19:23 2019 +0200

    Revert a change in latest dataformat related commit
---
 .../java/org/apache/camel/reifier/dataformat/DataFormatReifier.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git 
a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java
 
b/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java
index 93ffa52..bd0cba3 100644
--- 
a/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java
+++ 
b/core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/DataFormatReifier.java
@@ -157,6 +157,9 @@ public abstract class DataFormatReifier<T extends 
DataFormatDefinition> {
                 return dataFormat;
             }
         }
+        if (type.getDataFormat() != null) {
+            return type.getDataFormat();
+        }
         return reifier(type).createDataFormat(camelContext);
     }