From 1e8c1a6b8be4c002cceda1dd2e37e4ff432f20ab Mon Sep 17 00:00:00 2001 From: Jean Niklas L'orange Date: Thu, 18 Feb 2016 00:42:00 +0100 Subject: [PATCH] [WAGON-451] Accept NO CONTENT in resourceExists This patch makes 204 NO CONTENT responses from HTTP HEAD requests in wagon-http and wagon-http-lightweight return true in `resourceExists`, instead of throwing an exception. The patch also adds makes wagon-http-lightweight accept 304 NOT MODIFIED, to make it consistent with the wagon-http implementation. --- .../maven/wagon/providers/http/LightweightHttpWagon.java | 4 +++- .../wagon/providers/http/AbstractHttpClientWagon.java | 9 ++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java b/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java index 6ad558397..18425dfc1 100644 --- a/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java +++ b/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java @@ -392,7 +392,9 @@ public boolean resourceExists( String resourceName ) switch ( statusCode ) { - case HttpURLConnection.HTTP_OK: + case HttpURLConnection.HTTP_OK: // 200 + case HttpURLConnection.HTTP_NO_CONTENT: // 204 + case HttpURLConnection.HTTP_NOT_MODIFIED: // 304 return true; case HttpURLConnection.HTTP_FORBIDDEN: 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 b01899d88..9bbcb3d6b 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 @@ -698,10 +698,9 @@ private boolean resourceExists( int wait, String resourceName ) boolean result; switch ( statusCode ) { - case HttpStatus.SC_OK: - result = true; - break; - case HttpStatus.SC_NOT_MODIFIED: + case HttpStatus.SC_OK: // 200 + case HttpStatus.SC_NO_CONTENT: // 204 + case HttpStatus.SC_NOT_MODIFIED: // 304 result = true; break; case HttpStatus.SC_FORBIDDEN: @@ -1144,4 +1143,4 @@ public static int getMaxBackoffWaitSeconds() { return MAX_BACKOFF_WAIT_SECONDS; } -} \ No newline at end of file +}