svn commit: r1151087 - /camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java

[davsclaus]

Author: davsclaus
Date: Tue Jul 26 13:25:27 2011
New Revision: 1151087

URL: http://svn.apache.org/viewvc?rev=1151087&view=rev
Log:
CAMEL-4269: Ftp consumer on disconnect should eager set loggedIn flag to false, 
in case the ftp API may not properly disconnect, causing the next pool to fail. 
Thanks to Marek for the patch.

Modified:
    
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java

Modified: 
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java?rev=1151087&r1=1151086&r2=1151087&view=diff
==============================================================================
--- 
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
 (original)
+++ 
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
 Tue Jul 26 13:25:27 2011
@@ -90,10 +90,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());
                 }
@@ -101,7 +103,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.");
         }
     }