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 2010/06/17 16:00:43 UTC
svn commit: r955604 - in
/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi:
TransactionErrorHandler.java TransactionErrorHandlerBuilder.java
Author: davsclaus
Date: Thu Jun 17 14:00:43 2010
New Revision: 955604
URL: http://svn.apache.org/viewvc?rev=955604&view=rev
Log:
CAMEL-2723: Fixed compiler error after refactorings.
Modified:
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java?rev=955604&r1=955603&r2=955604&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java Thu Jun 17 14:00:43 2010
@@ -16,6 +16,7 @@
*/
package org.apache.camel.spring.spi;
+import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
@@ -43,6 +44,7 @@ public class TransactionErrorHandler ext
/**
* Creates the transaction error handler.
*
+ * @param camelContext the camel context
* @param output outer processor that should use this default error handler
* @param logger logger to use for logging failures and redelivery attempts
* @param redeliveryProcessor an optional processor to run before redelivery attempt
@@ -51,10 +53,10 @@ public class TransactionErrorHandler ext
* @param exceptionPolicyStrategy strategy for onException handling
* @param transactionTemplate the transaction template
*/
- public TransactionErrorHandler(Processor output, Logger logger, Processor redeliveryProcessor,
+ public TransactionErrorHandler(CamelContext camelContext, Processor output, Logger logger, Processor redeliveryProcessor,
RedeliveryPolicy redeliveryPolicy, Predicate handledPolicy,
ExceptionPolicyStrategy exceptionPolicyStrategy, TransactionTemplate transactionTemplate) {
- super(output, logger, redeliveryProcessor, redeliveryPolicy, handledPolicy, null, null, false);
+ super(camelContext, output, logger, redeliveryProcessor, redeliveryPolicy, handledPolicy, null, null, false);
setExceptionPolicy(exceptionPolicyStrategy);
this.transactionTemplate = transactionTemplate;
}
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java?rev=955604&r1=955603&r2=955604&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java Thu Jun 17 14:00:43 2010
@@ -110,8 +110,9 @@ public class TransactionErrorHandlerBuil
ObjectHelper.notNull(transactionTemplate, "transactionTemplate", this);
- TransactionErrorHandler answer = new TransactionErrorHandler(processor, getLogger(), getOnRedelivery(),
- getRedeliveryPolicy(), getHandledPolicy(), getExceptionPolicyStrategy(), transactionTemplate);
+ TransactionErrorHandler answer = new TransactionErrorHandler(routeContext.getCamelContext(), processor,
+ getLogger(), getOnRedelivery(), getRedeliveryPolicy(), getHandledPolicy(),
+ getExceptionPolicyStrategy(), transactionTemplate);
// configure error handler before we can use it
configure(answer);
return answer;