Author: davsclaus
Date: Sun Apr 29 12:51:26 2012
New Revision: 1331908
URL: http://svn.apache.org/viewvc?rev=1331908&view=rev
Log:
CAMEL-5224: Do not delete done file if noop=true
Added:
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/component/file/FilerConsumerDoneFileNoopTest.java
- copied unchanged from r1331907,
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FilerConsumerDoneFileNoopTest.java
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1331907
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/component/file/GenericFileOnCompletion.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java?rev=1331908&r1=1331907&r2=1331908&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java
(original)
+++
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java
Sun Apr 29 12:51:26 2012
@@ -109,8 +109,8 @@ public class GenericFileOnCompletion<T>
endpoint.getIdempotentRepository().add(absoluteFileName);
}
- // delete done file if used
- if (endpoint.getDoneFileName() != null) {
+ // delete done file if used (and not noop=true)
+ if (endpoint.getDoneFileName() != null && !endpoint.isNoop()) {
// done file must be in same path as the original input file
String doneFileName =
endpoint.createDoneFileName(absoluteFileName);
ObjectHelper.notEmpty(doneFileName, "doneFileName", endpoint);
@@ -133,7 +133,6 @@ public class GenericFileOnCompletion<T>
} catch (Exception e) {
handleException(e);
}
-
}
/**
