Return-Path: X-Original-To: apmail-maven-commits-archive@www.apache.org Delivered-To: apmail-maven-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E284F10192 for ; Tue, 22 Oct 2013 03:04:56 +0000 (UTC) Received: (qmail 22983 invoked by uid 500); 22 Oct 2013 03:04:50 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 22784 invoked by uid 500); 22 Oct 2013 03:04:49 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 22484 invoked by uid 99); 22 Oct 2013 03:04:43 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Oct 2013 03:04:43 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A9FC54FE15; Tue, 22 Oct 2013 03:04:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: olamy@apache.org To: commits@maven.apache.org Date: Tue, 22 Oct 2013 03:04:41 -0000 Message-Id: <54ff3c6c0937499c99db7765cf187933@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/9] git commit: Removed unnecessary GZIP content handling code (transparent content decoding is provided by HttpClient) Removed unnecessary GZIP content handling code (transparent content decoding is provided by HttpClient) Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/16f0f9de Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/16f0f9de Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/16f0f9de Branch: refs/heads/master Commit: 16f0f9de356c0c2e060148bcfea5ddb4be7fcfb2 Parents: a12972e Author: Oleg Kalnichevski Authored: Fri Sep 20 17:04:13 2013 +0200 Committer: Oleg Kalnichevski Committed: Tue Sep 24 13:47:26 2013 +0200 ---------------------------------------------------------------------- .../providers/http/AbstractHttpClientWagon.java | 50 ++++---------------- 1 file changed, 9 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/16f0f9de/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 51e0157..d195fae 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 @@ -35,7 +35,6 @@ import java.util.Locale; import java.util.Map; import java.util.Properties; import java.util.TimeZone; -import java.util.zip.GZIPInputStream; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLException; @@ -61,6 +60,7 @@ import org.apache.http.client.methods.HttpHead; import org.apache.http.client.methods.HttpPut; import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.client.protocol.HttpClientContext; +import org.apache.http.client.utils.DateUtils; import org.apache.http.config.Registry; import org.apache.http.config.RegistryBuilder; import org.apache.http.conn.HttpClientConnectionManager; @@ -76,8 +76,6 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.impl.conn.BasicHttpClientConnectionManager; import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; -import org.apache.http.impl.cookie.DateParseException; -import org.apache.http.impl.cookie.DateUtils; import org.apache.http.message.BasicHeader; import org.apache.http.protocol.HTTP; import org.apache.http.util.TextUtils; @@ -975,8 +973,6 @@ public abstract class AbstractHttpClientWagon } } - InputStream is; - Header contentLengthHeader = response.getFirstHeader( "Content-Length" ); if ( contentLengthHeader != null ) @@ -995,48 +991,20 @@ public abstract class AbstractHttpClientWagon } Header lastModifiedHeader = response.getFirstHeader( "Last-Modified" ); - - long lastModified = 0; - if ( lastModifiedHeader != null ) { - try - { - lastModified = DateUtils.parseDate( lastModifiedHeader.getValue() ).getTime(); - - resource.setLastModified( lastModified ); + Date lastModified = DateUtils.parseDate(lastModifiedHeader.getValue()); + if ( lastModified != null ) { + resource.setLastModified( lastModified.getTime() ); + fireTransferDebug( "last-modified = " + lastModifiedHeader.getValue() + + " (" + lastModified.getTime() + ")" ); } - catch ( DateParseException e ) - { - fireTransferDebug( "Unable to parse last modified header" ); - } - - fireTransferDebug( "last-modified = " + lastModifiedHeader.getValue() + " (" + lastModified + ")" ); } - Header contentEncoding = response.getFirstHeader( "Content-Encoding" ); - boolean isGZipped = contentEncoding == null ? false : "gzip".equalsIgnoreCase( contentEncoding.getValue() ); - - try - { - is = response.getEntity().getContent(); - - if ( isGZipped ) - { - is = new GZIPInputStream( is ); - } - } - catch ( IOException e ) - { - fireTransferError( resource, e, TransferEvent.REQUEST_GET ); - - String msg = - "Error occurred while retrieving from remote repository " + getRepository() + ": " + e.getMessage(); - - throw new TransferFailedException( msg, e ); + HttpEntity entity = response.getEntity(); + if ( entity != null ) { + inputData.setInputStream( entity.getContent() ); } - - inputData.setInputStream( is ); } catch ( IOException e ) {