Updated Branches: refs/heads/camel-2.10.x 089665e5d -> ad1824a5f
CAMEL-6416 fixed the NPE when some scripting exceptions don't have cause Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/decf9815 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/decf9815 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/decf9815 Branch: refs/heads/camel-2.10.x Commit: decf9815915db2c528b51407eff30a548acbaca5 Parents: 089665e Author: Willem Jiang <ningji...@apache.org> Authored: Mon Jun 3 16:35:32 2013 +0800 Committer: Willem Jiang <ningji...@apache.org> Committed: Wed Jul 3 10:18:37 2013 +0800 ---------------------------------------------------------------------- .../java/org/apache/camel/builder/script/ScriptBuilder.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/decf9815/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java ---------------------------------------------------------------------- diff --git a/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java b/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java index 72ed963..9feca5e 100644 --- a/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java +++ b/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java @@ -344,8 +344,12 @@ public class ScriptBuilder implements Expression, Predicate, Processor { } catch (ScriptException e) { if (LOG.isDebugEnabled()) { LOG.debug("Script evaluation failed: " + e.getMessage(), e); + } + if (e.getCause()!= null) { + throw createScriptEvaluationException(e.getCause()); + } else { + throw createScriptEvaluationException(e); } - throw createScriptEvaluationException(e.getCause()); } catch (IOException e) { throw createScriptEvaluationException(e); }
