You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by st...@apache.org on 2011/05/30 21:55:15 UTC
svn commit: r1129331 -
/maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
Author: struberg
Date: Mon May 30 19:55:15 2011
New Revision: 1129331
URL: http://svn.apache.org/viewvc?rev=1129331&view=rev
Log:
WAGON-332 add FTPReply.DIRECTORY_STATUS 212 to the valid STAT results
Modified:
maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
Modified: maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java?rev=1129331&r1=1129330&r2=1129331&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java Mon May 30 19:55:15 2011
@@ -19,15 +19,6 @@ package org.apache.maven.wagon.providers
* under the License.
*/
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-
import org.apache.commons.net.ProtocolCommandEvent;
import org.apache.commons.net.ProtocolCommandListener;
import org.apache.commons.net.ftp.FTP;
@@ -49,6 +40,15 @@ import org.apache.maven.wagon.repository
import org.apache.maven.wagon.resource.Resource;
import org.codehaus.plexus.util.IOUtil;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+
/**
* FtpWagon
@@ -473,8 +473,10 @@ public class FtpWagon
String filename = PathUtils.filename( resource.getName() );
int status = ftp.stat( filename );
- return ( ( status == FTPReply.FILE_STATUS ) || ( status == FTPReply.FILE_STATUS_OK )
- || ( status == FTPReply.COMMAND_OK ) || ( status == FTPReply.SYSTEM_STATUS ) );
+ return ( ( status == FTPReply.FILE_STATUS ) || ( status == FTPReply.DIRECTORY_STATUS )
+ || ( status == FTPReply.FILE_STATUS_OK ) // not in the RFC but used by some FTP servers
+ || ( status == FTPReply.COMMAND_OK ) // not in the RFC but used by some FTP servers
+ || ( status == FTPReply.SYSTEM_STATUS ) );
}
catch ( IOException e )
{