Repository: camel Updated Branches: refs/heads/master 545906c7a -> b2851eab7
Upgrade jsonpath Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/401acabe Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/401acabe Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/401acabe Branch: refs/heads/master Commit: 401acabec0f959b26e256efde41f8c8e6cea42bc Parents: 545906c Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Nov 8 08:45:46 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Nov 8 08:45:46 2014 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/camel/jsonpath/JsonPathEngine.java | 4 +--- parent/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/401acabe/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathEngine.java ---------------------------------------------------------------------- diff --git a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathEngine.java b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathEngine.java index 3616dbc..c7881ce 100644 --- a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathEngine.java +++ b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathEngine.java @@ -45,9 +45,7 @@ public class JsonPathEngine { } // the message body type should use the suitable read method - if (configuration.getProvider().isContainer(json)) { - return path.read(json); - } else if (json instanceof String) { + if (json instanceof String) { String str = (String) json; return path.read(str); } else if (json instanceof InputStream) { http://git-wip-us.apache.org/repos/asf/camel/blob/401acabe/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 42da3a0..5338058 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -265,8 +265,8 @@ <jsendnsca-bundle-version>1.3.1_3</jsendnsca-bundle-version> <jsonlib-bundle-version>2.4_1</jsonlib-bundle-version> <jsonlib-version>2.4</jsonlib-version> - <json-path-version>0.9.1</json-path-version> - <json-smart-version>1.2</json-smart-version> + <json-path-version>1.1.0</json-path-version> + <json-smart-version>2.0</json-smart-version> <jsp-api-2.1-version>1.0.1</jsp-api-2.1-version> <jsr311-api-version>1.1.1</jsr311-api-version> <jsmpp-bundle-version>2.1.0_4</jsmpp-bundle-version>
