You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/07/09 15:07:44 UTC

svn commit: r675153 - in /servicemix/components/bindings/servicemix-ftp/trunk/src/main/java/org/apache/servicemix/ftp: FtpPollerEndpoint.java FtpSenderEndpoint.java

Author: gnodet
Date: Wed Jul  9 06:07:43 2008
New Revision: 675153

URL: http://svn.apache.org/viewvc?rev=675153&view=rev
Log:
Revert SM-1449

Modified:
    servicemix/components/bindings/servicemix-ftp/trunk/src/main/java/org/apache/servicemix/ftp/FtpPollerEndpoint.java
    servicemix/components/bindings/servicemix-ftp/trunk/src/main/java/org/apache/servicemix/ftp/FtpSenderEndpoint.java

Modified: servicemix/components/bindings/servicemix-ftp/trunk/src/main/java/org/apache/servicemix/ftp/FtpPollerEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-ftp/trunk/src/main/java/org/apache/servicemix/ftp/FtpPollerEndpoint.java?rev=675153&r1=675152&r2=675153&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-ftp/trunk/src/main/java/org/apache/servicemix/ftp/FtpPollerEndpoint.java (original)
+++ servicemix/components/bindings/servicemix-ftp/trunk/src/main/java/org/apache/servicemix/ftp/FtpPollerEndpoint.java Wed Jul  9 06:07:43 2008
@@ -134,11 +134,7 @@
     }
 
     private String getWorkingPath() {
-        String p = (uri != null && uri.getPath() != null) ? uri.getPath() : ".";
-        if (p.startsWith("/")) {
-            p = p.substring(1);
-        }
-        return p;
+        return (uri != null && uri.getPath() != null) ? uri.getPath() : ".";
     }
 
     // Properties

Modified: servicemix/components/bindings/servicemix-ftp/trunk/src/main/java/org/apache/servicemix/ftp/FtpSenderEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-ftp/trunk/src/main/java/org/apache/servicemix/ftp/FtpSenderEndpoint.java?rev=675153&r1=675152&r2=675153&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-ftp/trunk/src/main/java/org/apache/servicemix/ftp/FtpSenderEndpoint.java (original)
+++ servicemix/components/bindings/servicemix-ftp/trunk/src/main/java/org/apache/servicemix/ftp/FtpSenderEndpoint.java Wed Jul  9 06:07:43 2008
@@ -162,11 +162,7 @@
             client = borrowClient();
             // Change to the directory specified by the URI path if any
             if (uri != null && uri.getPath() != null) {
-                String p = uri.getPath();
-                if (p.startsWith("/")) {
-                    p = p.substring(1);
-                }
-                if (!client.changeWorkingDirectory(p)) {
+                if (!client.changeWorkingDirectory(uri.getPath())) {
                     logger.warn("Unable to change ftp directory to '" + p + "'");
                 }
             }