CAMEL-7050: DeadLetterChannel should make more clear that it handles any new 
exception also. Added option to configure this behavior so ppl can turn that 
off and let new exceptions be unhandled, so transactions can rollback.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4136f927
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4136f927
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4136f927

Branch: refs/heads/master
Commit: 4136f9272e1cc646aa69d6af93d6ca42b79ccc1e
Parents: 42ded87
Author: Claus Ibsen <[email protected]>
Authored: Sun Jan 18 14:53:54 2015 +0100
Committer: Claus Ibsen <[email protected]>
Committed: Sun Jan 18 14:53:54 2015 +0100

----------------------------------------------------------------------
 .../apache/camel/blueprint/CamelErrorHandlerFactoryBean.java    | 5 +++++
 .../java/org/apache/camel/spring/ErrorHandlerDefinition.java    | 2 ++
 .../camel/spring/handler/ErrorHandlerDefinitionParser.java      | 5 +++++
 3 files changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/4136f927/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelErrorHandlerFactoryBean.java
----------------------------------------------------------------------
diff --git 
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelErrorHandlerFactoryBean.java
 
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelErrorHandlerFactoryBean.java
index 99b6c09..f81867b 100644
--- 
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelErrorHandlerFactoryBean.java
+++ 
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelErrorHandlerFactoryBean.java
@@ -44,6 +44,8 @@ public class CamelErrorHandlerFactoryBean extends 
AbstractCamelFactoryBean<Error
     @XmlAttribute
     private String deadLetterUri;
     @XmlAttribute
+    private Boolean deadLetterHandleNewException;
+    @XmlAttribute
     private LoggingLevel level;
     @XmlAttribute
     private String logName;
@@ -70,6 +72,9 @@ public class CamelErrorHandlerFactoryBean extends 
AbstractCamelFactoryBean<Error
             if (deadLetterUri != null) {
                 handler.setDeadLetterUri(deadLetterUri);
             }
+            if (deadLetterHandleNewException != null) {
+                
handler.setDeadLetterHandleNewException(deadLetterHandleNewException);
+            }
             if (useOriginalMessage != null) {
                 handler.setUseOriginalMessage(useOriginalMessage);
             }

http://git-wip-us.apache.org/repos/asf/camel/blob/4136f927/components/camel-spring/src/main/java/org/apache/camel/spring/ErrorHandlerDefinition.java
----------------------------------------------------------------------
diff --git 
a/components/camel-spring/src/main/java/org/apache/camel/spring/ErrorHandlerDefinition.java
 
b/components/camel-spring/src/main/java/org/apache/camel/spring/ErrorHandlerDefinition.java
index d2d6ffd..90281fe 100644
--- 
a/components/camel-spring/src/main/java/org/apache/camel/spring/ErrorHandlerDefinition.java
+++ 
b/components/camel-spring/src/main/java/org/apache/camel/spring/ErrorHandlerDefinition.java
@@ -38,6 +38,8 @@ public class ErrorHandlerDefinition extends IdentifiedType {
     @XmlAttribute
     private String deadLetterUri;
     @XmlAttribute
+    private String deadLetterHandleNewException;
+    @XmlAttribute
     private LoggingLevel level;
     @XmlAttribute
     private LoggingLevel rollbackLoggingLevel;

http://git-wip-us.apache.org/repos/asf/camel/blob/4136f927/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java
----------------------------------------------------------------------
diff --git 
a/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java
 
b/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java
index 305ea89..c9f2228 100644
--- 
a/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java
+++ 
b/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ErrorHandlerDefinitionParser.java
@@ -114,6 +114,11 @@ public class ErrorHandlerDefinitionParser extends 
BeanDefinitionParser {
             throw new IllegalArgumentException("Attribute deadLetterUri can 
only be used if type is "
                     + ErrorHandlerType.DeadLetterChannel.name() + ", in error 
handler with id: " + id);
         }
+        String deadLetterHandleNewException = 
element.getAttribute("deadLetterHandleNewException");
+        if (ObjectHelper.isNotEmpty(deadLetterHandleNewException) && 
!type.equals(ErrorHandlerType.DeadLetterChannel)) {
+            throw new IllegalArgumentException("Attribute 
deadLetterHandleNewException can only be used if type is "
+                    + ErrorHandlerType.DeadLetterChannel.name() + ", in error 
handler with id: " + id);
+        }
         String transactionTemplateRef = 
element.getAttribute("transactionTemplateRef");
         if (ObjectHelper.isNotEmpty(transactionTemplateRef) && 
!type.equals(ErrorHandlerType.TransactionErrorHandler)) {
             throw new IllegalArgumentException("Attribute 
transactionTemplateRef can only be used if type is "

Reply via email to