Author: wtam
Date: Fri Apr 17 01:16:39 2009
New Revision: 765825
URL: http://svn.apache.org/viewvc?rev=765825&view=rev
Log:
Merged revisions 765824 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r765824 | wtam | 2009-04-16 21:14:44 -0400 (Thu, 16 Apr 2009) | 1 line
Improve fixes for [CAMEL-1510] on Christopher Hunt's behalf.
........
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 17 01:16:39 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java?rev=765825&r1=765824&r2=765825&view=diff
==============================================================================
---
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java
(original)
+++
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java
Fri Apr 17 01:16:39 2009
@@ -198,9 +198,8 @@
// The goal of the following algorithm in terms of synchronisation
// is to provide fine grained locking i.e. retaining the lock only
// when required. Special consideration is given to releasing the
- // lock when calling an overloaded method such as
isInBatchComplete,
- // isOutBatchComplete and around sendExchanges. The latter is
- // especially important as the process of sending out the exchanges
+ // lock when calling an overloaded method i.e. sendExchanges.
+ // Unlocking is important as the process of sending out the
exchanges
// would otherwise block new exchanges from being queued.
queueLock.lock();
@@ -219,13 +218,8 @@
drainQueueTo(collection, batchSize);
}
- queueLock.unlock();
- try {
- if (!isOutBatchCompleted()) {
- continue;
- }
- } finally {
- queueLock.lock();
+ if (!isOutBatchCompleted()) {
+ continue;
}
}
