camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1443543 - in /camel/branches/camel-2.9.x: ./ camel-core/src/main/java/org/apache/camel/component/file/ components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/ components/camel-ftp/src/test/java/org/apache/camel/component...
Date Thu, 07 Feb 2013 15:17:34 GMT
Author: davsclaus
Date: Thu Feb  7 15:17:34 2013
New Revision: 1443543

URL: http://svn.apache.org/viewvc?rev=1443543&view=rev
Log:
CAMEL-6046: Fixed ftp consumer noop=true and idempotent=false not working.

Added:
    camel/branches/camel-2.9.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoopIdempotentFalseTest.java
      - copied unchanged from r1443542, camel/branches/camel-2.10.x/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoopIdempotentFalseTest.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/GenericFileEndpoint.java
    camel/branches/camel-2.9.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1443541
  Merged /camel/branches/camel-2.10.x:r1443542

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/GenericFileEndpoint.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java?rev=1443543&r1=1443542&r2=1443543&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
(original)
+++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
Thu Feb  7 15:17:34 2013
@@ -364,7 +364,7 @@ public abstract class GenericFileEndpoin
         this.charset = charset;
     }
 
-    boolean isIdempotentSet() {
+    protected boolean isIdempotentSet() {
         return idempotent != null;
     }
 

Modified: camel/branches/camel-2.9.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java?rev=1443543&r1=1443542&r2=1443543&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java
(original)
+++ camel/branches/camel-2.9.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileEndpoint.java
Thu Feb  7 15:17:34 2013
@@ -78,14 +78,15 @@ public abstract class RemoteFileEndpoint
         if (isDelete() && getMove() != null) {
             throw new IllegalArgumentException("You cannot both set delete=true and move
options");
         }
+
         // if noop=true then idempotent should also be configured
-        if (isNoop() && !isIdempotent()) {
+        if (isNoop() && !isIdempotentSet()) {
             log.info("Endpoint is configured with noop=true so forcing endpoint to be idempotent
as well");
             setIdempotent(true);
         }
 
         // if idempotent and no repository set then create a default one
-        if (isIdempotent() && idempotentRepository == null) {
+        if (isIdempotentSet() && isIdempotent() && idempotentRepository ==
null) {
             log.info("Using default memory based idempotent repository with cache max size:
" + DEFAULT_IDEMPOTENT_CACHE_SIZE);
             idempotentRepository = MemoryIdempotentRepository.memoryIdempotentRepository(DEFAULT_IDEMPOTENT_CACHE_SIZE);
         }



Mime
View raw message