Return-Path: Delivered-To: apmail-camel-commits-archive@www.apache.org Received: (qmail 49376 invoked from network); 5 Jun 2010 16:00:51 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 5 Jun 2010 16:00:51 -0000 Received: (qmail 32777 invoked by uid 500); 5 Jun 2010 16:00:51 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 32728 invoked by uid 500); 5 Jun 2010 16:00:51 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 32717 invoked by uid 99); 5 Jun 2010 16:00:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 05 Jun 2010 16:00:51 +0000 X-ASF-Spam-Status: No, hits=-1503.4 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 05 Jun 2010 16:00:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7970723889C5; Sat, 5 Jun 2010 16:00:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r951734 - in /camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote: FtpsConfiguration.java FtpsOperations.java Date: Sat, 05 Jun 2010 16:00:30 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100605160030.7970723889C5@eris.apache.org> Author: davsclaus Date: Sat Jun 5 16:00:30 2010 New Revision: 951734 URL: http://svn.apache.org/viewvc?rev=951734&view=rev Log: CAMEL-2790: execPbsz is optional. Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsConfiguration.java camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsOperations.java Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsConfiguration.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsConfiguration.java?rev=951734&r1=951733&r2=951734&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsConfiguration.java (original) +++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsConfiguration.java Sat Jun 5 16:00:30 2010 @@ -29,7 +29,7 @@ public class FtpsConfiguration extends F private boolean isImplicit; private boolean useSecureDataChannel; private String execProt = "P"; - private long execPbsz; + private Long execPbsz; public FtpsConfiguration() { setProtocol("ftps"); @@ -82,7 +82,7 @@ public class FtpsConfiguration extends F * Sets whether to use secure data channel when transferring file content *

* Default is false - * @see #setExecPbsz(long) + * @see #setExecPbsz(Long) * @see #setExecProt(String) */ public void setUseSecureDataChannel(boolean useSecureDataChannel) { @@ -106,7 +106,7 @@ public class FtpsConfiguration extends F this.execProt = execProt; } - public long getExecPbsz() { + public Long getExecPbsz() { return execPbsz; } @@ -117,7 +117,7 @@ public class FtpsConfiguration extends F * * @param execPbsz the buffer size */ - public void setExecPbsz(long execPbsz) { + public void setExecPbsz(Long execPbsz) { this.execPbsz = execPbsz; } } \ No newline at end of file Modified: camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsOperations.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsOperations.java?rev=951734&r1=951733&r2=951734&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsOperations.java (original) +++ camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsOperations.java Sat Jun 5 16:00:30 2010 @@ -48,7 +48,9 @@ public class FtpsOperations extends FtpO if (log.isDebugEnabled()) { log.debug("Secure data channel being initialized with execPbsz=" + config.getExecPbsz() + ", execPort=" + config.getExecProt()); } - getFtpClient().execPBSZ(config.getExecPbsz()); + if (config.getExecPbsz() != null) { + getFtpClient().execPBSZ(config.getExecPbsz()); + } getFtpClient().execPROT(config.getExecProt()); } catch (SSLException e) { throw new GenericFileOperationFailedException(client.getReplyCode(),