Author: davsclaus
Date: Fri Dec 9 12:39:43 2011
New Revision: 1212376
URL: http://svn.apache.org/viewvc?rev=1212376&view=rev
Log:
CAMEL-4754: Fixed issue when using context scoped onException, to ensure
errorHandler used at runtime is matching the route id that failed. Ensure
Multicast EIP setup route id on exchange for the exchange it emits.
Added:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RouteContextProcessor.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListContextScopedOnExceptionIssueTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RoutingSlipContextScopedOnExceptionIssueTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/ContextScopedOnExceptionCorrectRouteContextTest.java
- copied, changed from r1212239,
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/ContextScopedOnExceptionLogRouteTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LogProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/UnitOfWorkProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerSupportTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/ContextScopedOnExceptionLogRouteTest.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java?rev=1212376&r1=1212375&r2=1212376&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
Fri Dec 9 12:39:43 2011
@@ -57,7 +57,7 @@ public class DeadLetterChannelBuilder ex
getRedeliveryPolicy(), getExceptionPolicyStrategy(),
getFailureProcessor(), getDeadLetterUri(), isUseOriginalMessage(),
getRetryWhilePolicy(routeContext.getCamelContext()),
getExecutorServiceRef());
// configure error handler before we can use it
- configure(answer);
+ configure(routeContext, answer);
return answer;
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java?rev=1212376&r1=1212375&r2=1212376&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java
Fri Dec 9 12:39:43 2011
@@ -56,7 +56,7 @@ public class DefaultErrorHandlerBuilder
DefaultErrorHandler answer = new
DefaultErrorHandler(routeContext.getCamelContext(), processor, getLogger(),
getOnRedelivery(),
getRedeliveryPolicy(), getExceptionPolicyStrategy(),
getRetryWhilePolicy(routeContext.getCamelContext()), getExecutorServiceRef());
// configure error handler before we can use it
- configure(answer);
+ configure(routeContext, answer);
return answer;
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java?rev=1212376&r1=1212375&r2=1212376&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
Fri Dec 9 12:39:43 2011
@@ -22,6 +22,7 @@ import org.apache.camel.ErrorHandlerFact
import org.apache.camel.model.OnExceptionDefinition;
import org.apache.camel.processor.ErrorHandler;
import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy;
+import org.apache.camel.spi.RouteContext;
/**
* A builder of a <a href="http://camel.apache.org/error-handler.html">Error
Handler</a>
@@ -70,7 +71,8 @@ public interface ErrorHandlerBuilder ext
/**
* Configures the other error handler based on this error handler.
*
+ * @param routeContext the route context
* @param handler the other error handler
*/
- void configure(ErrorHandler handler);
+ void configure(RouteContext routeContext, ErrorHandler handler);
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java?rev=1212376&r1=1212375&r2=1212376&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
Fri Dec 9 12:39:43 2011
@@ -128,8 +128,6 @@ public class ErrorHandlerBuilderRef exte
return answer;
}
-
-
/**
* Returns whether a specific error handler builder has been configured or
not.
* <p/>
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java?rev=1212376&r1=1212375&r2=1212376&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
Fri Dec 9 12:39:43 2011
@@ -23,6 +23,7 @@ import org.apache.camel.model.OnExceptio
import org.apache.camel.processor.ErrorHandler;
import org.apache.camel.processor.ErrorHandlerSupport;
import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy;
+import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.ObjectHelper;
/**
@@ -41,12 +42,12 @@ public abstract class ErrorHandlerBuilde
}
}
- public void configure(ErrorHandler handler) {
+ public void configure(RouteContext routeContext, ErrorHandler handler) {
if (handler instanceof ErrorHandlerSupport) {
ErrorHandlerSupport handlerSupport = (ErrorHandlerSupport) handler;
for (OnExceptionDefinition exception : exceptions) {
- handlerSupport.addExceptionPolicy(exception);
+ handlerSupport.addExceptionPolicy(routeContext, exception);
}
}
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java?rev=1212376&r1=1212375&r2=1212376&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/LoggingErrorHandlerBuilder.java
Fri Dec 9 12:39:43 2011
@@ -53,7 +53,7 @@ public class LoggingErrorHandlerBuilder
CamelLogger logger = new CamelLogger(log, level);
LoggingErrorHandler handler = new
LoggingErrorHandler(routeContext.getCamelContext(), processor, logger,
getExceptionPolicyStrategy());
- configure(handler);
+ configure(routeContext, handler);
return handler;
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java?rev=1212376&r1=1212375&r2=1212376&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java
Fri Dec 9 12:39:43 2011
@@ -18,7 +18,9 @@ package org.apache.camel.model;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
@@ -76,8 +78,6 @@ public class OnExceptionDefinition exten
@XmlTransient
private List<Class> exceptionClasses;
@XmlTransient
- private Processor errorHandler;
- @XmlTransient
private Predicate handledPolicy;
@XmlTransient
private Predicate continuedPolicy;
@@ -87,6 +87,9 @@ public class OnExceptionDefinition exten
private Processor onRedelivery;
@XmlTransient
private Boolean routeScoped;
+ // TODO: in Camel 3.0 the OnExceptionDefinition should not contain state
and ErrorHandler processors
+ @XmlTransient
+ private final Map<String, Processor> errorHandlers = new HashMap<String,
Processor>();
public OnExceptionDefinition() {
}
@@ -181,10 +184,9 @@ public class OnExceptionDefinition exten
Processor child = createOutputsProcessor(routeContext);
if (child != null) {
// wrap in our special safe fallback error handler if OnException
have child output
- errorHandler = new FatalFallbackErrorHandler(child);
- } else {
- // do not wrap as there is no child output
- errorHandler = null;
+ Processor errorHandler = new FatalFallbackErrorHandler(child);
+ String id = routeContext.getRoute().getId();
+ errorHandlers.put(id, errorHandler);
}
// lookup the error handler builder
ErrorHandlerBuilder builder =
(ErrorHandlerBuilder)routeContext.getRoute().getErrorHandlerBuilder();
@@ -749,8 +751,12 @@ public class OnExceptionDefinition exten
this.exceptions = exceptions;
}
- public Processor getErrorHandler() {
- return errorHandler;
+ public Processor getErrorHandler(String routeId) {
+ return errorHandlers.get(routeId);
+ }
+
+ public Collection<Processor> getErrorHandlers() {
+ return errorHandlers.values();
}
public RedeliveryPolicyDefinition getRedeliveryPolicy() {
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java?rev=1212376&r1=1212375&r2=1212376&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java
Fri Dec 9 12:39:43 2011
@@ -28,6 +28,7 @@ import org.apache.camel.model.RouteDefin
import
org.apache.camel.processor.exceptionpolicy.DefaultExceptionPolicyStrategy;
import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyKey;
import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy;
+import org.apache.camel.spi.RouteContext;
import org.apache.camel.support.ChildServiceSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,12 +45,16 @@ public abstract class ErrorHandlerSuppor
protected final Map<ExceptionPolicyKey, OnExceptionDefinition>
exceptionPolicies = new LinkedHashMap<ExceptionPolicyKey,
OnExceptionDefinition>();
protected ExceptionPolicyStrategy exceptionPolicy =
createDefaultExceptionPolicyStrategy();
- public void addExceptionPolicy(OnExceptionDefinition exceptionType) {
- Processor processor = exceptionType.getErrorHandler();
- addChildService(processor);
+ public void addExceptionPolicy(RouteContext routeContext,
OnExceptionDefinition exceptionType) {
+ if (routeContext != null) {
+ // add error handler as child service so they get lifecycle handled
+ Processor errorHandler =
exceptionType.getErrorHandler(routeContext.getRoute().getId());
+ if (errorHandler != null) {
+ addChildService(errorHandler);
+ }
+ }
List<Class> list = exceptionType.getExceptionClasses();
-
for (Class clazz : list) {
String routeId = null;
// only get the route id, if the exception type is route scoped
@@ -65,21 +70,6 @@ public abstract class ErrorHandlerSuppor
}
/**
- * Attempts to invoke the handler for this particular exception if one is
available
- */
- protected boolean customProcessorForException(Exchange exchange, Throwable
exception) throws Exception {
- OnExceptionDefinition policy = getExceptionPolicy(exchange, exception);
- if (policy != null) {
- Processor processor = policy.getErrorHandler();
- if (processor != null) {
- processor.process(exchange);
- return true;
- }
- }
- return false;
- }
-
- /**
* Attempts to find the best suited {@link OnExceptionDefinition} to be
used for handling the given thrown exception.
*
* @param exchange the exchange
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LogProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LogProcessor.java?rev=1212376&r1=1212375&r2=1212376&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LogProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LogProcessor.java
Fri Dec 9 12:39:43 2011
@@ -59,7 +59,7 @@ public class LogProcessor implements Asy
@Override
public String toString() {
- return "Log[" + expression + "]";
+ return "Log(" + logger.getLog().getName() + ")[" + expression + "]";
}
public String getTraceLabel() {
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java?rev=1212376&r1=1212375&r2=1212376&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
Fri Dec 9 12:39:43 2011
@@ -871,13 +871,13 @@ public class MulticastProcessor extends
}
// and wrap in unit of work processor so the copy exchange also
can run under UoW
- answer = createUnitOfWorkProcessor(processor, exchange);
+ answer = createUnitOfWorkProcessor(routeContext, processor,
exchange);
// add to cache
errorHandlers.putIfAbsent(key, answer);
} else {
// and wrap in unit of work processor so the copy exchange also
can run under UoW
- answer = createUnitOfWorkProcessor(processor, exchange);
+ answer = createUnitOfWorkProcessor(routeContext, processor,
exchange);
}
return answer;
@@ -886,16 +886,17 @@ public class MulticastProcessor extends
/**
* Strategy to create the {@link UnitOfWorkProcessor} to be used for the
sub route
*
- * @param processor the processor wrapped in this unit of work processor
- * @param exchange the exchange
+ * @param routeContext the route context
+ * @param processor the processor wrapped in this unit of work processor
+ * @param exchange the exchange
* @return the unit of work processor
*/
- protected UnitOfWorkProcessor createUnitOfWorkProcessor(Processor
processor, Exchange exchange) {
+ protected UnitOfWorkProcessor createUnitOfWorkProcessor(RouteContext
routeContext, Processor processor, Exchange exchange) {
UnitOfWork parent = exchange.getProperty(Exchange.PARENT_UNIT_OF_WORK,
UnitOfWork.class);
if (parent != null) {
- return new ChildUnitOfWorkProcessor(parent, processor);
+ return new ChildUnitOfWorkProcessor(parent, routeContext,
processor);
} else {
- return new UnitOfWorkProcessor(processor);
+ return new UnitOfWorkProcessor(routeContext, processor);
}
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java?rev=1212376&r1=1212375&r2=1212376&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryErrorHandler.java
Fri Dec 9 12:39:43 2011
@@ -33,6 +33,7 @@ import org.apache.camel.model.OnExceptio
import org.apache.camel.spi.ExecutorServiceManager;
import org.apache.camel.spi.SubUnitOfWorkCallback;
import org.apache.camel.spi.ThreadPoolProfile;
+import org.apache.camel.spi.UnitOfWork;
import org.apache.camel.util.AsyncProcessorConverterHelper;
import org.apache.camel.util.AsyncProcessorHelper;
import org.apache.camel.util.CamelContextHelper;
@@ -631,10 +632,21 @@ public abstract class RedeliveryErrorHan
data.asyncDelayedRedelivery =
exceptionPolicy.isAsyncDelayedRedelivery(exchange.getContext());
// route specific failure handler?
- Processor processor = exceptionPolicy.getErrorHandler();
+ Processor processor = null;
+ UnitOfWork uow = exchange.getUnitOfWork();
+ if (uow != null && uow.getRouteContext() != null) {
+ String routeId = uow.getRouteContext().getRoute().getId();
+ processor = exceptionPolicy.getErrorHandler(routeId);
+ } else if (!exceptionPolicy.getErrorHandlers().isEmpty()) {
+ // note this should really not happen, but we have this code
as a fail safe
+ // to be backwards compatible with the old behavior
+ log.warn("Cannot determine current route from Exchange with
id: {}, will fallback and use first error handler.", exchange.getExchangeId());
+ processor =
exceptionPolicy.getErrorHandlers().iterator().next();
+ }
if (processor != null) {
data.failureProcessor = processor;
}
+
// route specific on redelivery?
processor = exceptionPolicy.getOnRedelivery();
if (processor != null) {
Added:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RouteContextProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RouteContextProcessor.java?rev=1212376&view=auto
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RouteContextProcessor.java
(added)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RouteContextProcessor.java
Fri Dec 9 12:39:43 2011
@@ -0,0 +1,69 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.processor;
+
+import org.apache.camel.AsyncCallback;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.spi.RouteContext;
+import org.apache.camel.spi.UnitOfWork;
+
+/**
+ * This processor tracks the current {@link RouteContext} while processing the
{@link Exchange}.
+ * This ensures that the {@link Exchange} have details under which route its
being currently processed.
+ */
+public class RouteContextProcessor extends DelegateAsyncProcessor {
+
+ private final RouteContext routeContext;
+
+ public RouteContextProcessor(RouteContext routeContext, Processor
processor) {
+ super(processor);
+ this.routeContext = routeContext;
+ }
+
+ @Override
+ protected boolean processNext(final Exchange exchange, final AsyncCallback
callback) {
+ // push the current route context
+ if (exchange.getUnitOfWork() != null) {
+ exchange.getUnitOfWork().pushRouteContext(routeContext);
+ }
+
+ boolean sync = processor.process(exchange, new AsyncCallback() {
+ public void done(boolean doneSync) {
+ try {
+ UnitOfWork uow = exchange.getUnitOfWork();
+ // pop the route context we just used
+ if (uow != null) {
+ uow.popRouteContext();
+ }
+ } catch (Exception e) {
+ exchange.setException(e);
+ } finally {
+ callback.done(doneSync);
+ }
+ }
+ });
+
+ return sync;
+ }
+
+ @Override
+ public String toString() {
+ return "RouteContextProcessor[" + processor + "]";
+ }
+
+}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/UnitOfWorkProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/UnitOfWorkProcessor.java?rev=1212376&r1=1212375&r2=1212376&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/UnitOfWorkProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/UnitOfWorkProcessor.java
Fri Dec 9 12:39:43 2011
@@ -98,6 +98,14 @@ public class UnitOfWorkProcessor extends
return true;
}
+
+ // if a route context has been configured, then wrap the processor
with a
+ // RouteContextProcessor to ensure we track the route context
properly during
+ // processing of the exchange
+ if (routeContext != null) {
+ processor = new RouteContextProcessor(routeContext, processor);
+ }
+
Object synchronous =
exchange.removeProperty(Exchange.UNIT_OF_WORK_PROCESS_SYNC);
if (synchronous != null) {
// the exchange signalled to process synchronously
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java?rev=1212376&r1=1212375&r2=1212376&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultChannel.java
Fri Dec 9 12:39:43 2011
@@ -32,13 +32,13 @@ import org.apache.camel.Service;
import org.apache.camel.model.ModelChannel;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.processor.InterceptorToAsyncProcessorBridge;
+import org.apache.camel.processor.RouteContextProcessor;
import org.apache.camel.spi.InterceptStrategy;
import org.apache.camel.spi.LifecycleStrategy;
import org.apache.camel.spi.RouteContext;
-import org.apache.camel.spi.UnitOfWork;
import org.apache.camel.support.ServiceSupport;
-import org.apache.camel.util.AsyncProcessorConverterHelper;
import org.apache.camel.util.AsyncProcessorHelper;
+import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.OrderedComparator;
import org.apache.camel.util.ServiceHelper;
import org.slf4j.Logger;
@@ -70,6 +70,7 @@ public class DefaultChannel extends Serv
private ProcessorDefinition<?> childDefinition;
private CamelContext camelContext;
private RouteContext routeContext;
+ private RouteContextProcessor routeContextProcessor;
public List<Processor> next() {
List<Processor> answer = new ArrayList<Processor>(1);
@@ -145,12 +146,14 @@ public class DefaultChannel extends Serv
@Override
protected void doStart() throws Exception {
- ServiceHelper.startServices(errorHandler, output);
+ // create route context processor to wrap output
+ routeContextProcessor = new RouteContextProcessor(routeContext,
getOutput());
+ ServiceHelper.startServices(errorHandler, output,
routeContextProcessor);
}
@Override
protected void doStop() throws Exception {
- ServiceHelper.stopServices(output, errorHandler);
+ ServiceHelper.stopServices(output, errorHandler,
routeContextProcessor);
}
@SuppressWarnings("unchecked")
@@ -233,7 +236,7 @@ public class DefaultChannel extends Serv
output = target;
}
- //@Override
+ @Override
public void postInitChannel(ProcessorDefinition<?> outputDefinition,
RouteContext routeContext) throws Exception {
for (InterceptStrategy strategy : interceptors) {
// apply stream caching at the end as it should be outer most
@@ -295,29 +298,9 @@ public class DefaultChannel extends Serv
return true;
}
- // push the current route context
- if (exchange.getUnitOfWork() != null) {
- exchange.getUnitOfWork().pushRouteContext(routeContext);
- }
-
- AsyncProcessor async =
AsyncProcessorConverterHelper.convert(processor);
- boolean sync = async.process(exchange, new AsyncCallback() {
- public void done(boolean doneSync) {
- try {
- UnitOfWork uow = exchange.getUnitOfWork();
- // pop the route context we just used
- if (uow != null) {
- uow.popRouteContext();
- }
- } catch (Exception e) {
- exchange.setException(e);
- } finally {
- callback.done(doneSync);
- }
- }
- });
-
- return sync;
+ // process the exchange using the route context processor
+ ObjectHelper.notNull(routeContextProcessor, "RouteContextProcessor",
this);
+ return routeContextProcessor.process(exchange, callback);
}
/**
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerSupportTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerSupportTest.java?rev=1212376&r1=1212375&r2=1212376&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerSupportTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerSupportTest.java
Fri Dec 9 12:39:43 2011
@@ -33,7 +33,7 @@ public class ErrorHandlerSupportTest ext
exceptions.add(ParentException.class);
ErrorHandlerSupport support = new ShuntErrorHandlerSupport();
- support.addExceptionPolicy(new OnExceptionDefinition(exceptions));
+ support.addExceptionPolicy(null, new
OnExceptionDefinition(exceptions));
assertEquals(ChildException.class, getExceptionPolicyFor(support, new
ChildException(), 0));
assertEquals(ParentException.class, getExceptionPolicyFor(support, new
ParentException(), 1));
@@ -45,7 +45,7 @@ public class ErrorHandlerSupportTest ext
exceptions.add(ChildException.class);
ErrorHandlerSupport support = new ShuntErrorHandlerSupport();
- support.addExceptionPolicy(new OnExceptionDefinition(exceptions));
+ support.addExceptionPolicy(null, new
OnExceptionDefinition(exceptions));
assertEquals(ChildException.class, getExceptionPolicyFor(support, new
ChildException(), 1));
assertEquals(ParentException.class, getExceptionPolicyFor(support, new
ParentException(), 0));
@@ -53,8 +53,8 @@ public class ErrorHandlerSupportTest ext
public void testTwoPolicyChildFirst() {
ErrorHandlerSupport support = new ShuntErrorHandlerSupport();
- support.addExceptionPolicy(new
OnExceptionDefinition(ChildException.class));
- support.addExceptionPolicy(new
OnExceptionDefinition(ParentException.class));
+ support.addExceptionPolicy(null, new
OnExceptionDefinition(ChildException.class));
+ support.addExceptionPolicy(null, new
OnExceptionDefinition(ParentException.class));
assertEquals(ChildException.class, getExceptionPolicyFor(support, new
ChildException(), 0));
assertEquals(ParentException.class, getExceptionPolicyFor(support, new
ParentException(), 0));
@@ -62,8 +62,8 @@ public class ErrorHandlerSupportTest ext
public void testTwoPolicyChildLast() {
ErrorHandlerSupport support = new ShuntErrorHandlerSupport();
- support.addExceptionPolicy(new
OnExceptionDefinition(ParentException.class));
- support.addExceptionPolicy(new
OnExceptionDefinition(ChildException.class));
+ support.addExceptionPolicy(null, new
OnExceptionDefinition(ParentException.class));
+ support.addExceptionPolicy(null, new
OnExceptionDefinition(ChildException.class));
assertEquals(ChildException.class, getExceptionPolicyFor(support, new
ChildException(), 0));
assertEquals(ParentException.class, getExceptionPolicyFor(support, new
ParentException(), 0));
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListContextScopedOnExceptionIssueTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListContextScopedOnExceptionIssueTest.java?rev=1212376&view=auto
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListContextScopedOnExceptionIssueTest.java
(added)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListContextScopedOnExceptionIssueTest.java
Fri Dec 9 12:39:43 2011
@@ -0,0 +1,120 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.processor;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ *
+ */
+public class RecipientListContextScopedOnExceptionIssueTest extends
ContextTestSupport {
+
+ public void testUsingInterceptor() throws Exception {
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ onException(Exception.class).handled(true)
+ .process(new Processor() {
+ @Override
+ public void process(Exchange exchange) throws
Exception {
+ String routeId =
exchange.getUnitOfWork().getRouteContext().getRoute().getId();
+ assertEquals("fail", routeId);
+ }
+ }).to("mock:error");
+
+ interceptSendToEndpoint("direct*").process(new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ String target =
exchange.getIn().getHeader(Exchange.INTERCEPTED_ENDPOINT, String.class);
+ exchange.getIn().setHeader("target", target);
+ }
+ });
+
+ from("direct:start").routeId("start")
+ .recipientList(header("foo"));
+
+ from("direct:foo").routeId("foo")
+ .setBody(constant("Bye World")).to("mock:foo");
+
+ from("direct:fail").routeId("fail")
+ .throwException(new IllegalArgumentException("Forced"));
+ }
+ });
+ context.start();
+
+ getMockEndpoint("mock:foo").expectedMessageCount(1);
+ getMockEndpoint("mock:error").expectedMessageCount(1);
+
getMockEndpoint("mock:error").message(0).header("target").isEqualTo("direct://fail");
+
+ String foo = "direct:foo,direct:fail";
+
+ Map<String, Object> headers = new HashMap<String, Object>();
+ headers.put("foo", foo);
+ headers.put(Exchange.FILE_NAME, "hello.txt");
+
+ template.sendBodyAndHeaders("direct:start", "Hello World", headers);
+
+ assertMockEndpointsSatisfied();
+ }
+
+ public void testUsingExistingHeaders() throws Exception {
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ onException(Exception.class).handled(true)
+ .process(new Processor() {
+ @Override
+ public void process(Exchange exchange) throws
Exception {
+ String routeId =
exchange.getUnitOfWork().getRouteContext().getRoute().getId();
+ assertEquals("fail", routeId);
+ }
+ }).to("mock:error");
+
+ from("direct:start").routeId("start")
+ .recipientList(header("foo"));
+
+ from("direct:foo").routeId("foo")
+ .setBody(constant("Bye World")).to("mock:foo");
+
+ from("direct:fail").routeId("fail")
+ .throwException(new
IllegalArgumentException("Forced"));
+ }
+ });
+ context.start();
+
+ getMockEndpoint("mock:foo").expectedMessageCount(1);
+
getMockEndpoint("mock:foo").message(0).header(Exchange.TO_ENDPOINT).isEqualTo("mock://foo");
+ getMockEndpoint("mock:error").expectedMessageCount(1);
+
getMockEndpoint("mock:error").message(0).header(Exchange.FAILURE_ENDPOINT).isEqualTo("direct://fail");
+
+ String foo = "direct:foo,direct:fail";
+
+ Map<String, Object> headers = new HashMap<String, Object>();
+ headers.put("foo", foo);
+ headers.put(Exchange.FILE_NAME, "hello.txt");
+
+ template.sendBodyAndHeaders("direct:start", "Hello World", headers);
+
+ assertMockEndpointsSatisfied();
+ }
+
+}
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RoutingSlipContextScopedOnExceptionIssueTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RoutingSlipContextScopedOnExceptionIssueTest.java?rev=1212376&view=auto
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RoutingSlipContextScopedOnExceptionIssueTest.java
(added)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RoutingSlipContextScopedOnExceptionIssueTest.java
Fri Dec 9 12:39:43 2011
@@ -0,0 +1,120 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.processor;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ *
+ */
+public class RoutingSlipContextScopedOnExceptionIssueTest extends
ContextTestSupport {
+
+ public void testUsingInterceptor() throws Exception {
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ onException(Exception.class).handled(true)
+ .process(new Processor() {
+ @Override
+ public void process(Exchange exchange) throws
Exception {
+ String routeId =
exchange.getUnitOfWork().getRouteContext().getRoute().getId();
+ assertEquals("fail", routeId);
+ }
+ }).to("mock:error");
+
+ interceptSendToEndpoint("direct*").process(new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ String target =
exchange.getIn().getHeader(Exchange.INTERCEPTED_ENDPOINT, String.class);
+ exchange.getIn().setHeader("target", target);
+ }
+ });
+
+ from("direct:start").routeId("start")
+ .routingSlip(header("foo"));
+
+ from("direct:foo").routeId("foo")
+ .setBody(constant("Bye World")).to("mock:foo");
+
+ from("direct:fail").routeId("fail")
+ .throwException(new IllegalArgumentException("Forced"));
+ }
+ });
+ context.start();
+
+ getMockEndpoint("mock:foo").expectedMessageCount(1);
+ getMockEndpoint("mock:error").expectedMessageCount(1);
+
getMockEndpoint("mock:error").message(0).header("target").isEqualTo("direct://fail");
+
+ String foo = "direct:foo,direct:fail";
+
+ Map<String, Object> headers = new HashMap<String, Object>();
+ headers.put("foo", foo);
+ headers.put(Exchange.FILE_NAME, "hello.txt");
+
+ template.sendBodyAndHeaders("direct:start", "Hello World", headers);
+
+ assertMockEndpointsSatisfied();
+ }
+
+ public void testUsingExistingHeaders() throws Exception {
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ onException(Exception.class).handled(true)
+ .process(new Processor() {
+ @Override
+ public void process(Exchange exchange) throws
Exception {
+ String routeId =
exchange.getUnitOfWork().getRouteContext().getRoute().getId();
+ assertEquals("fail", routeId);
+ }
+ }).to("mock:error");
+
+ from("direct:start").routeId("start")
+ .routingSlip(header("foo"));
+
+ from("direct:foo").routeId("foo")
+ .setBody(constant("Bye World")).to("mock:foo");
+
+ from("direct:fail").routeId("fail")
+ .throwException(new
IllegalArgumentException("Forced"));
+ }
+ });
+ context.start();
+
+ getMockEndpoint("mock:foo").expectedMessageCount(1);
+
getMockEndpoint("mock:foo").message(0).header(Exchange.TO_ENDPOINT).isEqualTo("mock://foo");
+ getMockEndpoint("mock:error").expectedMessageCount(1);
+
getMockEndpoint("mock:error").message(0).header(Exchange.FAILURE_ENDPOINT).isEqualTo("direct://fail");
+
+ String foo = "direct:foo,direct:fail";
+
+ Map<String, Object> headers = new HashMap<String, Object>();
+ headers.put("foo", foo);
+ headers.put(Exchange.FILE_NAME, "hello.txt");
+
+ template.sendBodyAndHeaders("direct:start", "Hello World", headers);
+
+ assertMockEndpointsSatisfied();
+ }
+
+}
Copied:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/ContextScopedOnExceptionCorrectRouteContextTest.java
(from r1212239,
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/ContextScopedOnExceptionLogRouteTest.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/ContextScopedOnExceptionCorrectRouteContextTest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/ContextScopedOnExceptionCorrectRouteContextTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/ContextScopedOnExceptionLogRouteTest.java&r1=1212239&r2=1212376&rev=1212376&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/ContextScopedOnExceptionLogRouteTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/ContextScopedOnExceptionCorrectRouteContextTest.java
Fri Dec 9 12:39:43 2011
@@ -17,14 +17,46 @@
package org.apache.camel.processor.onexception;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
/**
*
*/
-public class ContextScopedOnExceptionLogRouteTest extends ContextTestSupport {
-
- public void testContextScopedOnExceptionLogRoute() throws Exception {
+public class ContextScopedOnExceptionCorrectRouteContextTest extends
ContextTestSupport {
+
+ @Override
+ public boolean isUseRouteBuilder() {
+ return false;
+ }
+
+ public void testContextScopedOnExceptionLogRouteBarFail() throws Exception
{
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ onException(Exception.class)
+ .log("Error due ${exception.message}")
+ .process(new Processor() {
+ @Override
+ public void process(Exchange exchange) throws
Exception {
+ String routeId =
exchange.getUnitOfWork().getRouteContext().getRoute().getId();
+ assertEquals("bar", routeId);
+ }
+ });
+
+ from("direct:start").routeId("foo")
+ .to("mock:foo")
+ .to("direct:bar")
+ .to("mock:result");
+
+ from("direct:bar").routeId("bar")
+ .to("mock:bar")
+ .throwException(new IllegalArgumentException("Forced bar
error"));
+ }
+ });
+ context.start();
+
getMockEndpoint("mock:foo").expectedMessageCount(1);
getMockEndpoint("mock:bar").expectedMessageCount(1);
getMockEndpoint("mock:result").expectedMessageCount(0);
@@ -39,23 +71,47 @@ public class ContextScopedOnExceptionLog
assertMockEndpointsSatisfied();
}
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
+ public void testContextScopedOnExceptionLogRouteFooFail() throws Exception
{
+ context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
onException(Exception.class)
- .log("Error due ${exception.message}");
-
+ .log("Error due ${exception.message}")
+ .process(new Processor() {
+ @Override
+ public void process(Exchange exchange) throws
Exception {
+ String routeId =
exchange.getUnitOfWork().getRouteContext().getRoute().getId();
+ assertEquals("foo", routeId);
+ }
+ });
+
from("direct:start").routeId("foo")
.to("mock:foo")
+ .throwException(new IllegalArgumentException("Forced foo
error"))
.to("direct:bar")
.to("mock:result");
-
+
from("direct:bar").routeId("bar")
- .to("mock:bar")
- .throwException(new IllegalArgumentException("Forced"));
+ .to("mock:bar");
+
+ from("direct:killer").routeId("killer")
+ .to("mock:killer");
}
- };
+ });
+ context.start();
+
+ getMockEndpoint("mock:foo").expectedMessageCount(1);
+ getMockEndpoint("mock:bar").expectedMessageCount(0);
+ getMockEndpoint("mock:result").expectedMessageCount(0);
+
+ try {
+ template.sendBody("direct:start", "Hello World");
+ fail("Should have thrown exception");
+ } catch (Exception e) {
+ // expected
+ }
+
+ assertMockEndpointsSatisfied();
}
+
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/ContextScopedOnExceptionLogRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/ContextScopedOnExceptionLogRouteTest.java?rev=1212376&r1=1212375&r2=1212376&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/ContextScopedOnExceptionLogRouteTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/onexception/ContextScopedOnExceptionLogRouteTest.java
Fri Dec 9 12:39:43 2011
@@ -23,8 +23,31 @@ import org.apache.camel.builder.RouteBui
*
*/
public class ContextScopedOnExceptionLogRouteTest extends ContextTestSupport {
-
- public void testContextScopedOnExceptionLogRoute() throws Exception {
+
+ @Override
+ public boolean isUseRouteBuilder() {
+ return false;
+ }
+
+ public void testContextScopedOnExceptionLogRouteBarFail() throws Exception
{
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ onException(Exception.class)
+ .log("Error due ${exception.message}");
+
+ from("direct:start").routeId("foo")
+ .to("mock:foo")
+ .to("direct:bar")
+ .to("mock:result");
+
+ from("direct:bar").routeId("bar")
+ .to("mock:bar")
+ .throwException(new IllegalArgumentException("Forced bar
error"));
+ }
+ });
+ context.start();
+
getMockEndpoint("mock:foo").expectedMessageCount(1);
getMockEndpoint("mock:bar").expectedMessageCount(1);
getMockEndpoint("mock:result").expectedMessageCount(0);
@@ -39,23 +62,40 @@ public class ContextScopedOnExceptionLog
assertMockEndpointsSatisfied();
}
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
+ public void testContextScopedOnExceptionLogRouteFooFail() throws Exception
{
+ context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
onException(Exception.class)
.log("Error due ${exception.message}");
-
+
from("direct:start").routeId("foo")
.to("mock:foo")
+ .throwException(new IllegalArgumentException("Forced foo
error"))
.to("direct:bar")
.to("mock:result");
-
+
from("direct:bar").routeId("bar")
- .to("mock:bar")
- .throwException(new IllegalArgumentException("Forced"));
+ .to("mock:bar");
+
+ from("direct:killer").routeId("killer")
+ .to("mock:killer");
}
- };
+ });
+ context.start();
+
+ getMockEndpoint("mock:foo").expectedMessageCount(1);
+ getMockEndpoint("mock:bar").expectedMessageCount(0);
+ getMockEndpoint("mock:result").expectedMessageCount(0);
+
+ try {
+ template.sendBody("direct:start", "Hello World");
+ fail("Should have thrown exception");
+ } catch (Exception e) {
+ // expected
+ }
+
+ assertMockEndpointsSatisfied();
}
+
}
Modified:
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java?rev=1212376&r1=1212375&r2=1212376&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java
(original)
+++
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringTransactionPolicy.java
Fri Dec 9 12:39:43 2011
@@ -89,7 +89,7 @@ public class SpringTransactionPolicy imp
answer = createTransactionErrorHandler(routeContext, processor,
builder);
answer.setExceptionPolicy(builder.getExceptionPolicyStrategy());
// configure our answer based on the existing error handler
- builder.configure(answer);
+ builder.configure(routeContext, answer);
} else {
// no transaction error handler builder configure so create a
temporary one as we got all
// the needed information form the configured builder anyway this
allow us to use transacted
@@ -109,7 +109,7 @@ public class SpringTransactionPolicy imp
answer = createTransactionErrorHandler(routeContext, processor,
txBuilder);
answer.setExceptionPolicy(txBuilder.getExceptionPolicyStrategy());
// configure our answer based on the existing error handler
- txBuilder.configure(answer);
+ txBuilder.configure(routeContext, answer);
// set the route to use our transacted error handler builder
routeContext.getRoute().setErrorHandlerBuilder(txBuilder);
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=1212376&r1=1212375&r2=1212376&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
Fri Dec 9 12:39:43 2011
@@ -110,7 +110,7 @@ public class TransactionErrorHandlerBuil
getLogger(), getOnRedelivery(), getRedeliveryPolicy(),
getExceptionPolicyStrategy(), transactionTemplate,
getRetryWhilePolicy(routeContext.getCamelContext()),
getExecutorServiceRef());
// configure error handler before we can use it
- configure(answer);
+ configure(routeContext, answer);
return answer;
}
Modified:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.java?rev=1212376&r1=1212375&r2=1212376&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.java
(original)
+++
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.java
Fri Dec 9 12:39:43 2011
@@ -22,7 +22,6 @@ import org.apache.camel.RuntimeCamelExce
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spring.SpringRouteBuilder;
import org.apache.camel.spring.SpringTestSupport;
-import org.junit.Ignore;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.jdbc.core.JdbcTemplate;