You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by wt...@apache.org on 2009/04/16 22:31:14 UTC
svn commit: r765748 - in /camel/branches/camel-1.x: ./
camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java
Author: wtam
Date: Thu Apr 16 20:31:14 2009
New Revision: 765748
URL: http://svn.apache.org/viewvc?rev=765748&view=rev
Log:
Merged revisions 765743 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r765743 | wtam | 2009-04-16 16:16:04 -0400 (Thu, 16 Apr 2009) | 1 line
[CAMEL-1510] removed getCollection() and reduced method scope to prevent collection from modified outside SenderThread
........
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 Thu Apr 16 20:31:14 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
+/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
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=765748&r1=765747&r2=765748&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 Thu Apr 16 20:31:14 2009
@@ -121,7 +121,7 @@
* A strategy method to decide if the "in" batch is completed. That is, whether the resulting exchanges in
* the in queue should be drained to the "out" collection.
*/
- protected boolean isInBatchCompleted(int num) {
+ private boolean isInBatchCompleted(int num) {
return num >= batchSize;
}
@@ -129,7 +129,7 @@
* A strategy method to decide if the "out" batch is completed. That is, whether the resulting exchange in
* the out collection should be sent.
*/
- protected boolean isOutBatchCompleted() {
+ private boolean isOutBatchCompleted() {
if (outBatchSize == 0) {
// out batch is disabled, so go ahead and send.
return true;
@@ -156,10 +156,6 @@
collection.clear();
}
- protected Collection<Exchange> getCollection() {
- return collection;
- }
-
/**
* Enqueues an exchange for later batch processing.
*/