camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject [2/3] camel git commit: CAMEL-8473 Fixed CS error
Date Wed, 11 Mar 2015 09:33:24 GMT
CAMEL-8473 Fixed CS error


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

Branch: refs/heads/master
Commit: 803a62a21f1641eb3bbc0a510e60f1aa730f9de3
Parents: 2470023
Author: Willem Jiang <willem.jiang@gmail.com>
Authored: Wed Mar 11 17:30:08 2015 +0800
Committer: Willem Jiang <willem.jiang@gmail.com>
Committed: Wed Mar 11 17:30:08 2015 +0800

----------------------------------------------------------------------
 .../apache/camel/spring/handler/ErrorHandlerDefinitionParser.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/803a62a2/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 5ca1974..65ae81a 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
@@ -147,7 +147,8 @@ public class ErrorHandlerDefinitionParser extends BeanDefinitionParser
{
                     + type.name() + ", in error handler with id: " + id);
         }
         String onPrepareFailureRef = element.getAttribute("onPrepareFailureRef");
-        if (ObjectHelper.isNotEmpty(onPrepareFailureRef) && (type.equals(ErrorHandlerType.TransactionErrorHandler)
|| type.equals(ErrorHandlerType.LoggingErrorHandler) || type.equals(ErrorHandlerType.NoErrorHandler)))
{
+        if (ObjectHelper.isNotEmpty(onPrepareFailureRef) && (type.equals(ErrorHandlerType.TransactionErrorHandler)
|| type.equals(ErrorHandlerType.LoggingErrorHandler) 
+            || type.equals(ErrorHandlerType.NoErrorHandler))) {
             throw new IllegalArgumentException("Attribute onPrepareFailureRef is not supported
by error handler type: "
                     + type.name() + ", in error handler with id: " + id);
         }


Mime
View raw message