You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/03/19 15:45:52 UTC
[1/3] camel git commit: CAMEL-8515: Camel marshal/unmarshal - Should
catch throwable in case dataformat causes an java.lang.Error
Repository: camel
Updated Branches:
refs/heads/camel-2.14.x 51cf42260 -> 1e526e490
refs/heads/camel-2.15.x 5d7b3b1ba -> 89cb7e6cc
refs/heads/master f8d1d999f -> 3d46316cd
CAMEL-8515: Camel marshal/unmarshal - Should catch throwable in case dataformat causes an java.lang.Error
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1e526e49
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1e526e49
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1e526e49
Branch: refs/heads/camel-2.14.x
Commit: 1e526e490e67ca0371a22b490cd1a027b7dfd880
Parents: 51cf422
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Mar 19 15:46:38 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Mar 19 15:47:30 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/processor/MarshalProcessor.java | 2 +-
.../main/java/org/apache/camel/processor/UnmarshalProcessor.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1e526e49/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java
index efa2b8e..7a45624 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java
@@ -82,7 +82,7 @@ public class MarshalProcessor extends ServiceSupport implements AsyncProcessor,
byte[] data = os.toByteArray();
out.setBody(data);
}
- } catch (Exception e) {
+ } catch (Throwable e) {
// remove OUT message, as an exception occurred
exchange.setOut(null);
exchange.setException(e);
http://git-wip-us.apache.org/repos/asf/camel/blob/1e526e49/camel-core/src/main/java/org/apache/camel/processor/UnmarshalProcessor.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/UnmarshalProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/UnmarshalProcessor.java
index 934fd2a..e81a283 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/UnmarshalProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/UnmarshalProcessor.java
@@ -76,7 +76,7 @@ public class UnmarshalProcessor extends ServiceSupport implements AsyncProcessor
} else {
out.setBody(result);
}
- } catch (Exception e) {
+ } catch (Throwable e) {
// remove OUT message, as an exception occurred
exchange.setOut(null);
exchange.setException(e);
[3/3] camel git commit: CAMEL-8515: Camel marshal/unmarshal - Should
catch throwable in case dataformat causes an java.lang.Error
Posted by da...@apache.org.
CAMEL-8515: Camel marshal/unmarshal - Should catch throwable in case dataformat causes an java.lang.Error
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3d46316c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3d46316c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3d46316c
Branch: refs/heads/master
Commit: 3d46316cd204f35a5d4b528aa15a0d4087032d69
Parents: f8d1d99
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Mar 19 15:46:38 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Mar 19 15:47:45 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/processor/MarshalProcessor.java | 2 +-
.../main/java/org/apache/camel/processor/UnmarshalProcessor.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3d46316c/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java
index efa2b8e..7a45624 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java
@@ -82,7 +82,7 @@ public class MarshalProcessor extends ServiceSupport implements AsyncProcessor,
byte[] data = os.toByteArray();
out.setBody(data);
}
- } catch (Exception e) {
+ } catch (Throwable e) {
// remove OUT message, as an exception occurred
exchange.setOut(null);
exchange.setException(e);
http://git-wip-us.apache.org/repos/asf/camel/blob/3d46316c/camel-core/src/main/java/org/apache/camel/processor/UnmarshalProcessor.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/UnmarshalProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/UnmarshalProcessor.java
index 934fd2a..e81a283 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/UnmarshalProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/UnmarshalProcessor.java
@@ -76,7 +76,7 @@ public class UnmarshalProcessor extends ServiceSupport implements AsyncProcessor
} else {
out.setBody(result);
}
- } catch (Exception e) {
+ } catch (Throwable e) {
// remove OUT message, as an exception occurred
exchange.setOut(null);
exchange.setException(e);
[2/3] camel git commit: CAMEL-8515: Camel marshal/unmarshal - Should
catch throwable in case dataformat causes an java.lang.Error
Posted by da...@apache.org.
CAMEL-8515: Camel marshal/unmarshal - Should catch throwable in case dataformat causes an java.lang.Error
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/89cb7e6c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/89cb7e6c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/89cb7e6c
Branch: refs/heads/camel-2.15.x
Commit: 89cb7e6cca3473d6f40779458741704c85d63ebf
Parents: 5d7b3b1
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Mar 19 15:46:38 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Mar 19 15:47:38 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/processor/MarshalProcessor.java | 2 +-
.../main/java/org/apache/camel/processor/UnmarshalProcessor.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/89cb7e6c/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java
index efa2b8e..7a45624 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/MarshalProcessor.java
@@ -82,7 +82,7 @@ public class MarshalProcessor extends ServiceSupport implements AsyncProcessor,
byte[] data = os.toByteArray();
out.setBody(data);
}
- } catch (Exception e) {
+ } catch (Throwable e) {
// remove OUT message, as an exception occurred
exchange.setOut(null);
exchange.setException(e);
http://git-wip-us.apache.org/repos/asf/camel/blob/89cb7e6c/camel-core/src/main/java/org/apache/camel/processor/UnmarshalProcessor.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/UnmarshalProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/UnmarshalProcessor.java
index 934fd2a..e81a283 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/UnmarshalProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/UnmarshalProcessor.java
@@ -76,7 +76,7 @@ public class UnmarshalProcessor extends ServiceSupport implements AsyncProcessor
} else {
out.setBody(result);
}
- } catch (Exception e) {
+ } catch (Throwable e) {
// remove OUT message, as an exception occurred
exchange.setOut(null);
exchange.setException(e);