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 tr...@apache.org on 2005/09/21 20:35:13 UTC
svn commit: r290777 -
/maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/ScpWagon.java
Author: trygvis
Date: Wed Sep 21 11:35:03 2005
New Revision: 290777
URL: http://svn.apache.org/viewcvs?rev=290777&view=rev
Log:
Fixing WAGONSSH-16: "SftpWagon should throw ResourceDoesNotExistException when
possible"
o Adding an improvement to the checking of errors in the case where the file
might be missing. This should really be done with proper tests for the
existance of the file.
Patch by Juan F. Codagnone.
Modified:
maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/ScpWagon.java
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/ScpWagon.java
URL: http://svn.apache.org/viewcvs/maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/ScpWagon.java?rev=290777&r1=290776&r2=290777&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/ScpWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/ScpWagon.java Wed Sep 21 11:35:03 2005
@@ -548,10 +548,8 @@
}
finally
{
- if ( out != null )
- {
- IoUtils.close( out );
- }
+ IoUtils.close( out );
+
if ( channel != null )
{
channel.disconnect();
@@ -562,7 +560,7 @@
}
protected void handleGetException( Resource resource, Exception e, File destination )
- throws TransferFailedException
+ throws TransferFailedException, ResourceDoesNotExistException
{
fireTransferError( resource, e, TransferEvent.REQUEST_GET );
@@ -578,7 +576,15 @@
String msg = "Error occured while downloading from the remote repository:" + getRepository();
- throw new TransferFailedException( msg, e );
+ // this sucks....
+ if( e.toString().equals("No such file"))
+ {
+ throw new ResourceDoesNotExistException( msg, e );
+ }
+ else
+ {
+ throw new TransferFailedException( msg, e );
+ }
}
public boolean getIfNewer( String resourceName, File destination, long timestamp )
---------------------------------------------------------------------
To unsubscribe, e-mail: wagon-cvs-unsubscribe@maven.apache.org
For additional commands, e-mail: wagon-cvs-help@maven.apache.org