Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2FD6C188C2 for ; Wed, 29 Jul 2015 13:09:40 +0000 (UTC) Received: (qmail 40546 invoked by uid 500); 29 Jul 2015 13:09:40 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 40498 invoked by uid 500); 29 Jul 2015 13:09:40 -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 40488 invoked by uid 99); 29 Jul 2015 13:09:40 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Jul 2015 13:09:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DA39FDFAF5; Wed, 29 Jul 2015 13:09:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davsclaus@apache.org To: commits@camel.apache.org Message-Id: <81b4cbac53054e3aa60db920bb557091@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: camel git commit: CAMEL-8818: camel-ftp should use 30 sec as default soTimeout. Thanks to Stephan Siano for the patch. Date: Wed, 29 Jul 2015 13:09:39 +0000 (UTC) Repository: camel Updated Branches: refs/heads/master f032da66d -> 7acd97f57 CAMEL-8818: camel-ftp should use 30 sec as default soTimeout. Thanks to Stephan Siano for the patch. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7acd97f5 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7acd97f5 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7acd97f5 Branch: refs/heads/master Commit: 7acd97f57d15699713324d9da385dba6e325bc9e Parents: f032da6 Author: Claus Ibsen Authored: Wed Jul 29 15:13:27 2015 +0200 Committer: Claus Ibsen Committed: Wed Jul 29 15:13:27 2015 +0200 ---------------------------------------------------------------------- .../camel/component/file/remote/RemoteFileConfiguration.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/7acd97f5/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java index 0f867b2..44e086d 100644 --- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java +++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java @@ -58,8 +58,8 @@ public abstract class RemoteFileConfiguration extends GenericFileConfiguration { private int connectTimeout = 10000; @UriParam(defaultValue = "30000") private int timeout = 30000; - @UriParam - private int soTimeout; + @UriParam(defaultValue = "300000") + private int soTimeout = 300000; @UriParam(defaultValue = "32768") private int receiveBufferSize = 32 * 1024; @UriParam