camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jans...@apache.org
Subject git commit: CAMEL-6663 - camel-sap-netweaver throws JsonParseException when using json=false option
Date Thu, 22 Aug 2013 17:13:38 GMT
Updated Branches:
  refs/heads/master bb4f2e5b5 -> 922ea959d


CAMEL-6663 - camel-sap-netweaver throws JsonParseException when using json=false option


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

Branch: refs/heads/master
Commit: 922ea959d5a4ab694397d1ee7cf5101ff106e4b3
Parents: bb4f2e5
Author: Jonathan Anstey <janstey@gmail.com>
Authored: Thu Aug 22 14:43:18 2013 -0230
Committer: Jonathan Anstey <janstey@gmail.com>
Committed: Thu Aug 22 14:43:18 2013 -0230

----------------------------------------------------------------------
 .../apache/camel/component/sap/netweaver/NetWeaverProducer.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/922ea959/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverProducer.java
b/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverProducer.java
index d62ac0d..3892b4c 100644
--- a/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverProducer.java
+++ b/components/camel-sap-netweaver/src/main/java/org/apache/camel/component/sap/netweaver/NetWeaverProducer.java
@@ -55,7 +55,7 @@ public class NetWeaverProducer extends DefaultProducer {
 
         String data = httpExchange.getOut().getBody(String.class);
 
-        if (data != null && getEndpoint().isJsonAsMap()) {
+        if (data != null && getEndpoint().isJsonAsMap() && getEndpoint().isJson())
{
             // map json string to json map
             ObjectMapper mapper = new ObjectMapper();
             Map<?, ?> map = mapper.readValue(data, Map.class);


Mime
View raw message