Author: davsclaus
Date: Sun Apr 29 16:04:39 2012
New Revision: 1331930
URL: http://svn.apache.org/viewvc?rev=1331930&view=rev
Log:
CAMEL-5193: Fixed WARN logging about cannot determine current route id
Added:
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/issues/SingleOutputInMulticastIssueTest.java
- copied unchanged from r1331928,
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/SingleOutputInMulticastIssueTest.java
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1331928
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java?rev=1331930&r1=1331929&r2=1331930&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
(original)
+++
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
Sun Apr 29 16:04:39 2012
@@ -866,15 +866,16 @@ public class MulticastProcessor extends
// instead of using ProcessorDefinition.wrapInErrorHandler)
try {
processor = builder.createErrorHandler(routeContext,
processor);
+
+ // and wrap in unit of work processor so the copy exchange
also can run under UoW
+ answer = createUnitOfWorkProcessor(routeContext, processor,
exchange);
+
// must start the error handler
- ServiceHelper.startServices(processor);
+ ServiceHelper.startServices(answer);
} catch (Exception e) {
throw ObjectHelper.wrapRuntimeCamelException(e);
}
- // and wrap in unit of work processor so the copy exchange also
can run under UoW
- answer = createUnitOfWorkProcessor(routeContext, processor,
exchange);
-
// add to cache
errorHandlers.putIfAbsent(key, answer);
} else {
