You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/06/15 11:04:53 UTC
svn commit: r784697 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/component/file/
main/java/org/apache/camel/component/file/strategy/
main/java/org/apache/camel/processor/idempotent/
test/java/org/apache/camel/component/file/ test/java/o...
Author: ningjiang
Date: Mon Jun 15 09:04:52 2009
New Revision: 784697
URL: http://svn.apache.org/viewvc?rev=784697&view=rev
Log:
CAMEL-1710 fixed the test errors of FileExclusiveReadRenameStrategyTest on Windows
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileLockExclusiveReadLockStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameExclusiveReadLockStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentOnCompletion.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMaxMessagesPerPollTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutOnlyTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java?rev=784697&r1=784696&r2=784697&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java Mon Jun 15 09:04:52 2009
@@ -120,14 +120,17 @@
// process the current exchange
processExchange(exchange);
+
+
}
-
+
// remove the file from the in progress list in case the batch was limited by max messages per poll
for (int index = 0; index < exchanges.size() && isRunAllowed(); index++) {
GenericFileExchange<T> exchange = (GenericFileExchange<T>) exchanges.poll();
String key = exchange.getGenericFile().getFileName();
endpoint.getInProgressRepository().remove(key);
}
+
}
/**
@@ -164,6 +167,8 @@
boolean begin = processStrategy.begin(operations, endpoint, exchange, exchange.getGenericFile());
if (!begin) {
log.warn(endpoint + " cannot begin processing file: " + exchange.getGenericFile());
+ // remove file from the in progress list as its no longer in progress
+ endpoint.getInProgressRepository().remove(exchange.getGenericFile().getFileName());
return;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileLockExclusiveReadLockStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileLockExclusiveReadLockStrategy.java?rev=784697&r1=784696&r2=784697&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileLockExclusiveReadLockStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileLockExclusiveReadLockStrategy.java Mon Jun 15 09:04:52 2009
@@ -71,7 +71,7 @@
try {
lock = timeout > 0 ? channel.tryLock() : channel.lock();
} catch (IllegalStateException ex) {
- // Also catch the OverlappingFileLockException here. Do nothing here
+ // Also catch the OverlappingFileLockException here. Do nothing here
}
if (lock != null) {
if (LOG.isTraceEnabled()) {
@@ -86,7 +86,7 @@
} else {
boolean interrupted = sleep();
if (interrupted) {
- // we were interrputed while sleeping, we are likely being shutdown so return false
+ // we were interrupted while sleeping, we are likely being shutdown so return false
return false;
}
}
@@ -103,7 +103,7 @@
}
boolean interrupted = sleep();
if (interrupted) {
- // we were interrputed while sleeping, we are likely being shutdown so return false
+ // we were interrupted while sleeping, we are likely being shutdown so return false
return false;
}
}
@@ -128,10 +128,10 @@
LOG.trace("Exclusive read lock not granted. Sleeping for 1000 millis.");
try {
Thread.sleep(1000);
- return true;
+ return false;
} catch (InterruptedException e) {
LOG.debug("Sleep interrupted while waiting for exclusive read lock, so breaking out");
- return false;
+ return true;
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameExclusiveReadLockStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameExclusiveReadLockStrategy.java?rev=784697&r1=784696&r2=784697&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameExclusiveReadLockStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/GenericFileRenameExclusiveReadLockStrategy.java Mon Jun 15 09:04:52 2009
@@ -60,7 +60,7 @@
}
}
- exclusive = operations.renameFile(file.getAbsoluteFilePath(), newFile.getAbsoluteFilePath());
+ exclusive = operations.renameFile(file.getAbsoluteFilePath(), newFile.getAbsoluteFilePath());
if (exclusive) {
if (LOG.isTraceEnabled()) {
LOG.trace("Acquired exclusive read lock to file: " + file);
@@ -70,7 +70,7 @@
} else {
boolean interrupted = sleep();
if (interrupted) {
- // we were interrputed while sleeping, we are likely being shutdown so return false
+ // we were interrupted while sleeping, we are likely being shutdown so return false
return false;
}
}
@@ -84,14 +84,14 @@
// noop
}
- private boolean sleep() {
+ private boolean sleep() {
LOG.trace("Exclusive read lock not granted. Sleeping for 1000 millis.");
try {
Thread.sleep(1000);
- return true;
- } catch (InterruptedException e) {
- LOG.debug("Sleep interrupted while waiting for exclusive read lock, so breaking out");
return false;
+ } catch (InterruptedException e) {
+ LOG.debug("Sleep interrupted while waiting for exclusive read lock, so breaking out");
+ return true;
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategy.java?rev=784697&r1=784696&r2=784697&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/strategy/MarkerFileExclusiveReadLockStrategy.java Mon Jun 15 09:04:52 2009
@@ -34,7 +34,7 @@
/**
* Acquires read lock to the given file using a marker file so other Camel consumers wont acquire the same file.
- * This is the default behaviour in Camel 1.x.
+ * This is the default behavior in Camel 1.x.
*/
public class MarkerFileExclusiveReadLockStrategy implements GenericFileExclusiveReadLockStrategy<File> {
private static final transient Log LOG = LogFactory.getLog(MarkerFileExclusiveReadLockStrategy.class);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentOnCompletion.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentOnCompletion.java?rev=784697&r1=784696&r2=784697&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentOnCompletion.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentOnCompletion.java Mon Jun 15 09:04:52 2009
@@ -45,7 +45,7 @@
public void onComplete(Exchange exchange) {
if (ExchangeHelper.isFailureHandled(exchange)) {
- // the exchange did not process succesfully but was failure handled by the dead letter channel
+ // the exchange did not process successfully but was failure handled by the dead letter channel
// and thus moved to the dead letter queue. We should thus not consider it as complete.
onFailedMessage(exchange, messageId);
} else {
@@ -58,7 +58,7 @@
}
/**
- * A strategy method to allow derived classes to overload the behaviour of
+ * A strategy method to allow derived classes to overload the behavior of
* processing a completed message
*
* @param exchange the exchange
@@ -74,7 +74,7 @@
}
/**
- * A strategy method to allow derived classes to overload the behaviour of
+ * A strategy method to allow derived classes to overload the behavior of
* processing a failed message
*
* @param exchange the exchange
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMaxMessagesPerPollTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMaxMessagesPerPollTest.java?rev=784697&r1=784696&r2=784697&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMaxMessagesPerPollTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeMaxMessagesPerPollTest.java Mon Jun 15 09:04:52 2009
@@ -26,7 +26,7 @@
*/
public class FileConsumeMaxMessagesPerPollTest extends ContextTestSupport {
- private String fileUrl = "file://target/poll/?consumer.delay=3000&sortBy=file:name&maxMessagesPerPoll=2";
+ private String fileUrl = "file://target/poll/?consumer.delay=2500&consumer.delay=2000&sortBy=file:name&maxMessagesPerPoll=2";
@Override
protected void setUp() throws Exception {
@@ -40,7 +40,7 @@
public void testMaxMessagesPerPoll() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Bye World", "Godday World");
- mock.setResultWaitTime(2000);
+ mock.setResultWaitTime(3000);
mock.expectedPropertyReceived(Exchange.BATCH_SIZE, 2);
assertMockEndpointsSatisfied();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutOnlyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutOnlyTest.java?rev=784697&r1=784696&r2=784697&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutOnlyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutOnlyTest.java Mon Jun 15 09:04:52 2009
@@ -32,7 +32,7 @@
// by default the use latest aggregatation strategy is used so we get message 9
result.expectedBodiesReceived("Message 9");
// should take 3 seconds to complete this one
- result.setMinimumResultWaitTime(3000);
+ result.setMinimumResultWaitTime(2900);
for (int i = 0; i < 10; i++) {
template.sendBodyAndHeader("direct:start", "Message " + i, "id", "1");