You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/01/22 15:54:20 UTC

svn commit: r1436982 - in /camel/branches/camel-2.9.x: ./ components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java

Author: davsclaus
Date: Tue Jan 22 14:54:19 2013
New Revision: 1436982

URL: http://svn.apache.org/viewvc?rev=1436982&view=rev
Log:
Added a bit more TRACE logging to camel-ftp

Modified:
    camel/branches/camel-2.9.x/   (props changed)
    camel/branches/camel-2.9.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
    camel/branches/camel-2.9.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1436980
  Merged /camel/branches/camel-2.10.x:r1436981

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.9.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.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/FtpOperations.java?rev=1436982&r1=1436981&r2=1436982&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java (original)
+++ camel/branches/camel-2.9.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java Tue Jan 22 14:54:19 2013
@@ -564,7 +564,9 @@ public class FtpOperations implements Re
     public String getCurrentDirectory() throws GenericFileOperationFailedException {
         log.trace("getCurrentDirectory()");
         try {
-            return client.printWorkingDirectory();
+            String answer = client.printWorkingDirectory();
+            log.trace("Current dir: {}", answer);
+            return answer;
         } catch (IOException e) {
             throw new GenericFileOperationFailedException(client.getReplyCode(), client.getReplyString(), e.getMessage(), e);
         }

Modified: camel/branches/camel-2.9.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.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/SftpOperations.java?rev=1436982&r1=1436981&r2=1436982&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java (original)
+++ camel/branches/camel-2.9.x/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java Tue Jan 22 14:54:19 2013
@@ -370,7 +370,9 @@ public class SftpOperations implements R
     public String getCurrentDirectory() throws GenericFileOperationFailedException {
         LOG.trace("getCurrentDirectory()");
         try {
-            return channel.pwd();
+            String answer = channel.pwd();
+            LOG.trace("Current dir: {}", answer);
+            return answer;
         } catch (SftpException e) {
             throw new GenericFileOperationFailedException("Cannot get current directory", e);
         }