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 9641D737B for ; Fri, 2 Sep 2011 09:50:37 +0000 (UTC) Received: (qmail 75246 invoked by uid 500); 2 Sep 2011 09:50:36 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 75159 invoked by uid 500); 2 Sep 2011 09:50:29 -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 75148 invoked by uid 99); 2 Sep 2011 09:50:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Sep 2011 09:50:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED 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; Fri, 02 Sep 2011 09:50:23 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0E6D6238889B for ; Fri, 2 Sep 2011 09:50:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1164449 - in /camel/branches/camel-2.8.x: ./ components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java Date: Fri, 02 Sep 2011 09:50:02 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110902095003.0E6D6238889B@eris.apache.org> Author: davsclaus Date: Fri Sep 2 09:50:02 2011 New Revision: 1164449 URL: http://svn.apache.org/viewvc?rev=1164449&view=rev Log: Merged revisions 1151087 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk Modified: camel/branches/camel-2.8.x/ (props changed) camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java Propchange: camel/branches/camel-2.8.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 2 09:50:02 2011 @@ -1 +1 @@ -/camel/trunk:1150651,1151000,1151054,1151362,1152170,1152755,1153620,1153812,1153829,1154684,1155230,1156108,1156260,1156277,1156479,1156524,1157348,1157798,1157831,1157878,1158153,1159171,1159174,1159326,1159457,1159460,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395 +/camel/trunk:1150651,1151000,1151054,1151087,1151362,1152170,1152755,1153620,1153812,1153829,1154684,1155230,1156108,1156260,1156277,1156479,1156524,1157348,1157798,1157831,1157878,1158153,1159171,1159174,1159326,1159457,1159460,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395 Propchange: camel/branches/camel-2.8.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java?rev=1164449&r1=1164448&r2=1164449&view=diff ============================================================================== --- camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java (original) +++ camel/branches/camel-2.8.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java Fri Sep 2 09:50:02 2011 @@ -92,10 +92,12 @@ public abstract class RemoteFileConsumer } protected void disconnect() { - // disconnect when stopping + // eager indicate we are no longer logged in + loggedIn = false; + + // disconnect try { if (getOperations().isConnected()) { - loggedIn = false; if (log.isDebugEnabled()) { log.debug("Disconnecting from: {}", remoteServer()); } @@ -103,7 +105,7 @@ public abstract class RemoteFileConsumer } } catch (GenericFileOperationFailedException e) { // ignore just log a warning - log.warn(e.getMessage()); + log.warn("Error occurred while disconnecting from " + remoteServer() + " due: " + e.getMessage() + ". This exception will be ignored."); } }