Repository: camel Updated Branches: refs/heads/camel-2.15.x a554780c3 -> 638412189 refs/heads/master 598a214a5 -> 17c39eaf1
CAMEL-8871: Fixed null body/header after transform called bean that throws exception. Thanks to Hans Orbaan for reporting. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/17c39eaf Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/17c39eaf Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/17c39eaf Branch: refs/heads/master Commit: 17c39eaf1f6a7ba8ac5ff0bbc5ff4aeac0f9c707 Parents: 598a214 Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Jun 15 11:39:07 2015 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Jun 15 11:39:07 2015 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/camel/processor/ConvertBodyProcessor.java | 2 +- .../main/java/org/apache/camel/processor/SetHeaderProcessor.java | 2 +- .../main/java/org/apache/camel/processor/SetPropertyProcessor.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/17c39eaf/camel-core/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java index 125e0e6..d42eae4 100644 --- a/camel-core/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java +++ b/camel-core/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java @@ -89,7 +89,7 @@ public class ConvertBodyProcessor extends ServiceSupport implements AsyncProcess Object value; try { value = old.getMandatoryBody(type); - } catch (Exception e) { + } catch (Throwable e) { exchange.setException(e); callback.done(true); return true; http://git-wip-us.apache.org/repos/asf/camel/blob/17c39eaf/camel-core/src/main/java/org/apache/camel/processor/SetHeaderProcessor.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/processor/SetHeaderProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/SetHeaderProcessor.java index b5d9854..7604af8 100644 --- a/camel-core/src/main/java/org/apache/camel/processor/SetHeaderProcessor.java +++ b/camel-core/src/main/java/org/apache/camel/processor/SetHeaderProcessor.java @@ -59,7 +59,7 @@ public class SetHeaderProcessor extends ServiceSupport implements AsyncProcessor old.setHeader(headerName, newHeader); - } catch (Exception e) { + } catch (Throwable e) { exchange.setException(e); } http://git-wip-us.apache.org/repos/asf/camel/blob/17c39eaf/camel-core/src/main/java/org/apache/camel/processor/SetPropertyProcessor.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/processor/SetPropertyProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/SetPropertyProcessor.java index 1276108..70d1a60 100644 --- a/camel-core/src/main/java/org/apache/camel/processor/SetPropertyProcessor.java +++ b/camel-core/src/main/java/org/apache/camel/processor/SetPropertyProcessor.java @@ -54,7 +54,7 @@ public class SetPropertyProcessor extends ServiceSupport implements AsyncProcess } exchange.setProperty(propertyName, newProperty); - } catch (Exception e) { + } catch (Throwable e) { exchange.setException(e); }
