You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wagon-commits@maven.apache.org by br...@apache.org on 2006/01/05 08:19:39 UTC
svn commit: r366105 - in /maven/wagon/trunk/wagon-providers/wagon-ftp:
pom.xml src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
Author: brett
Date: Wed Jan 4 23:19:33 2006
New Revision: 366105
URL: http://svn.apache.org/viewcvs?rev=366105&view=rev
Log:
[WAGONFTP-8] prevent error when an empty list of files is returned. upgrade commons-net for other bugfixes for Windows FTP servers
Submitted by: John Wells
Modified:
maven/wagon/trunk/wagon-providers/wagon-ftp/pom.xml
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/pom.xml
URL: http://svn.apache.org/viewcvs/maven/wagon/trunk/wagon-providers/wagon-ftp/pom.xml?rev=366105&r1=366104&r2=366105&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ftp/pom.xml (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ftp/pom.xml Wed Jan 4 23:19:33 2006
@@ -12,7 +12,7 @@
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
- <version>1.1.0</version>
+ <version>1.4.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -21,4 +21,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
URL: http://svn.apache.org/viewcvs/maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java?rev=366105&r1=366104&r2=366105&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 Wed Jan 4 23:19:33 2006
@@ -140,8 +140,8 @@
if ( !dirChanged )
{
- throw new ConnectionException( "Required directory: '" + getRepository().getBasedir() + "' " +
- "is missing" );
+ throw new ConnectionException(
+ "Required directory: '" + getRepository().getBasedir() + "' " + "is missing" );
}
}
catch ( IOException e )
@@ -326,7 +326,7 @@
String filename = PathUtils.filename( resource.getName() );
FTPFile[] ftpFiles = ftp.listFiles( filename );
- if ( ftpFiles == null )
+ if ( ftpFiles == null || ftpFiles.length <= 0 )
{
throw new ResourceDoesNotExistException( "Could not find file: '" + resource + "'" );
}
@@ -346,7 +346,10 @@
for ( int i = 0; i < dirs.length; i++ )
{
- ftp.changeWorkingDirectory( ".." );
+ if ( !ftp.changeWorkingDirectory( ".." ) )
+ {
+ throw new TransferFailedException( "Error changing directory to .." );
+ }
}
}
catch ( IOException e )
---------------------------------------------------------------------
To unsubscribe, e-mail: wagon-commits-unsubscribe@maven.apache.org
For additional commands, e-mail: wagon-commits-help@maven.apache.org