Author: davsclaus
Date: Fri Apr 27 07:57:07 2012
New Revision: 1331280
URL: http://svn.apache.org/viewvc?rev=1331280&view=rev
Log:
CAMEL-5210: Fixed NPE with loop copy and error occurred.
Added:
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/processor/LoopCopyErrorTest.java
- copied unchanged from r1331278,
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoopCopyErrorTest.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/LoopProcessor.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1331278
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/LoopProcessor.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/LoopProcessor.java?rev=1331280&r1=1331279&r2=1331280&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/LoopProcessor.java
(original)
+++
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/LoopProcessor.java
Fri Apr 27 07:57:07 2012
@@ -150,8 +150,8 @@ public class LoopProcessor extends Deleg
*/
protected Exchange prepareExchange(Exchange exchange, int index) {
if (copy) {
- // create a correlated copy, and do not handover completions on
copies
- return ExchangeHelper.createCorrelatedCopy(exchange, false);
+ // use a copy but let it reuse the same exchange id so it appear
as one exchange
+ return ExchangeHelper.createCopy(exchange, true);
} else {
ExchangeHelper.prepareOutToIn(exchange);
return exchange;