Updated Branches: refs/heads/master 5b987be4e -> 1c04f0a4a
HttpClient never returns invalid status codes (< 200) Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/9a1b7294 Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/9a1b7294 Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/9a1b7294 Branch: refs/heads/master Commit: 9a1b72942d03428de3dad0483084691619f3ba9d Parents: e8c135d Author: Oleg Kalnichevski <ol...@apache.org> Authored: Sat Sep 21 13:03:28 2013 +0200 Committer: Oleg Kalnichevski <ol...@apache.org> Committed: Tue Sep 24 13:47:26 2013 +0200 ---------------------------------------------------------------------- .../providers/http/AbstractHttpClientWagon.java | 25 -------------------- .../maven/wagon/providers/http/HttpWagon.java | 4 ---- 2 files changed, 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/9a1b7294/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java ---------------------------------------------------------------------- diff --git a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java index dd4fb8e..0b683ae 100755 --- a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java +++ b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java @@ -214,8 +214,6 @@ public abstract class AbstractHttpClientWagon } } - protected static final int SC_NULL = -1; - private static final TimeZone GMT_TIME_ZONE = TimeZone.getTimeZone( "GMT" ); private CloseableHttpClient client; @@ -529,14 +527,6 @@ public abstract class AbstractHttpClientWagon case HttpStatus.SC_SEE_OTHER: // 303 put( resource, source, httpEntity, calculateRelocatedUrl( response ) ); return; - case SC_NULL: - { - TransferFailedException e = - new TransferFailedException( "Failed to transfer file: " + url + reasonPhrase ); - fireTransferError( resource, e, TransferEvent.REQUEST_PUT ); - throw e; - } - case HttpStatus.SC_FORBIDDEN: fireSessionConnectionRefused(); throw new AuthorizationException( "Access denied to: " + url + reasonPhrase ); @@ -608,10 +598,6 @@ public abstract class AbstractHttpClientWagon case HttpStatus.SC_NOT_MODIFIED: return true; - - case SC_NULL: - throw new TransferFailedException( "Failed to transfer file: " + url + reasonPhrase ); - case HttpStatus.SC_FORBIDDEN: throw new AuthorizationException( "Access denied to: " + url + reasonPhrase ); @@ -850,8 +836,6 @@ public abstract class AbstractHttpClientWagon fireTransferDebug( url + " - Status code: " + statusCode + reasonPhrase ); - // TODO [BP]: according to httpclient docs, really should swallow the output on error. verify if that is - // required switch ( statusCode ) { case HttpStatus.SC_OK: @@ -860,15 +844,6 @@ public abstract class AbstractHttpClientWagon case HttpStatus.SC_NOT_MODIFIED: // return, leaving last modified set to original value so getIfNewer should return unmodified return; - - case SC_NULL: - { - TransferFailedException e = - new TransferFailedException( "Failed to transfer file: " + url + " " + reasonPhrase ); - fireTransferError( resource, e, TransferEvent.REQUEST_GET ); - throw e; - } - case HttpStatus.SC_FORBIDDEN: fireSessionConnectionRefused(); throw new AuthorizationException( "Access denied to: " + url + " " + reasonPhrase ); http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/9a1b7294/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java ---------------------------------------------------------------------- diff --git a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java index 68fad2c..c06f2cc 100755 --- a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java +++ b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java @@ -59,15 +59,11 @@ public class HttpWagon fireTransferDebug( url + " - Status code: " + statusCode ); - // TODO [BP]: according to httpclient docs, really should swallow the output on error. verify if that is required switch ( statusCode ) { case HttpStatus.SC_OK: break; - case SC_NULL: - throw new TransferFailedException( "Failed to transfer file: " ); - case HttpStatus.SC_FORBIDDEN: throw new AuthorizationException( "Access denied to: " + url );
