camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ra...@apache.org
Subject [1/2] git commit: CAMEL-7258 Fix camel-xmljson elementName and arrayName settings when using the xmljson() DSL. This closes #105.
Date Fri, 28 Feb 2014 19:25:28 GMT
Repository: camel
Updated Branches:
  refs/heads/camel-2.12.x 086066e55 -> bd9ddc97e


CAMEL-7258 Fix camel-xmljson elementName and arrayName settings when using the xmljson() DSL.
This closes #105.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8954897e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8954897e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8954897e

Branch: refs/heads/camel-2.12.x
Commit: 8954897e8b01c6d3eadfecf20545715daaa17742
Parents: 086066e
Author: Alexander Lomov <alexandr.lomov@gmail.com>
Authored: Fri Feb 28 17:26:58 2014 +0400
Committer: Raul Kripalani <raulk@apache.org>
Committed: Fri Feb 28 19:25:15 2014 +0000

----------------------------------------------------------------------
 .../org/apache/camel/model/dataformat/XmlJsonDataFormat.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/8954897e/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java
b/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java
index b29f4ed..31eb6e7 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java
@@ -96,10 +96,10 @@ public class XmlJsonDataFormat extends DataFormatDefinition {
             rootName = options.get(ROOT_NAME);
         }
         if (options.containsKey(ELEMENT_NAME)) {
-            encoding = options.get(ELEMENT_NAME);
+            elementName = options.get(ELEMENT_NAME);
         }
         if (options.containsKey(ARRAY_NAME)) {
-            elementName = options.get(ARRAY_NAME);
+            arrayName = options.get(ARRAY_NAME);
         }
         if (options.containsKey(EXPANDABLE_PROPERTIES)) {
             expandableProperties = Arrays.asList(options.get(EXPANDABLE_PROPERTIES).split("
"));


Mime
View raw message