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/63841218 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/63841218 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/63841218 Branch: refs/heads/camel-2.15.x Commit: 63841218949dfc53048fcd68d772fde8b21ee7ca Parents: a554780 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:31 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/63841218/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 40e863b..ede8610 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 @@ -79,7 +79,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/63841218/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 1edecca..3112a86 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 @@ -57,7 +57,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/63841218/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 d8c1bcb..62db15e 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 @@ -52,7 +52,7 @@ public class SetPropertyProcessor extends ServiceSupport implements AsyncProcess } exchange.setProperty(propertyName, newProperty); - } catch (Exception e) { + } catch (Throwable e) { exchange.setException(e); }
