Return-Path: X-Original-To: apmail-hc-commits-archive@www.apache.org Delivered-To: apmail-hc-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 4B6EB119AE for ; Fri, 1 Aug 2014 13:48:49 +0000 (UTC) Received: (qmail 3193 invoked by uid 500); 1 Aug 2014 13:48:49 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 3151 invoked by uid 500); 1 Aug 2014 13:48:49 -0000 Mailing-List: contact commits-help@hc.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "HttpComponents Project" Delivered-To: mailing list commits@hc.apache.org Received: (qmail 3142 invoked by uid 99); 1 Aug 2014 13:48:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Aug 2014 13:48:49 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Aug 2014 13:48:47 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 69B8C23892D9 for ; Fri, 1 Aug 2014 13:45:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1615099 [6/6] - in /httpcomponents/httpclient-android/branches/4.3.5-android: ./ src/main/ src/main/java/org/apache/http/ src/main/java/org/apache/http/auth/ src/main/java/org/apache/http/auth/params/ src/main/java/org/apache/http/client/ ... Date: Fri, 01 Aug 2014 13:45:16 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140801134523.69B8C23892D9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Copied: httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/message/BasicLineFormatterHC4.java (from r1615085, httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/message/BasicLineFormatter.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/message/BasicLineFormatterHC4.java?p2=httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/message/BasicLineFormatterHC4.java&p1=httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/message/BasicLineFormatter.java&r1=1615085&r2=1615099&rev=1615099&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/message/BasicLineFormatter.java (original) +++ httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/message/BasicLineFormatterHC4.java Fri Aug 1 13:45:09 2014 @@ -49,7 +49,7 @@ import org.apache.http.util.CharArrayBuf * @since 4.0 */ @Immutable -public class BasicLineFormatter implements LineFormatter { +public class BasicLineFormatterHC4 implements LineFormatter { /** * A default instance of this class, for use as default or fallback. @@ -60,11 +60,11 @@ public class BasicLineFormatter implemen * @deprecated (4.3) use {@link #INSTANCE} */ @Deprecated - public final static BasicLineFormatter DEFAULT = new BasicLineFormatter(); + public final static BasicLineFormatterHC4 DEFAULT = new BasicLineFormatterHC4(); - public final static BasicLineFormatter INSTANCE = new BasicLineFormatter(); + public final static BasicLineFormatterHC4 INSTANCE = new BasicLineFormatterHC4(); - public BasicLineFormatter() { + public BasicLineFormatterHC4() { super(); } @@ -100,7 +100,7 @@ public class BasicLineFormatter implemen public static String formatProtocolVersion(final ProtocolVersion version, final LineFormatter formatter) { - return (formatter != null ? formatter : BasicLineFormatter.INSTANCE) + return (formatter != null ? formatter : BasicLineFormatterHC4.INSTANCE) .appendProtocolVersion(null, version).toString(); } @@ -154,7 +154,7 @@ public class BasicLineFormatter implemen */ public static String formatRequestLine(final RequestLine reqline, final LineFormatter formatter) { - return (formatter != null ? formatter : BasicLineFormatter.INSTANCE) + return (formatter != null ? formatter : BasicLineFormatterHC4.INSTANCE) .formatRequestLine(null, reqline).toString(); } @@ -209,7 +209,7 @@ public class BasicLineFormatter implemen */ public static String formatStatusLine(final StatusLine statline, final LineFormatter formatter) { - return (formatter != null ? formatter : BasicLineFormatter.INSTANCE) + return (formatter != null ? formatter : BasicLineFormatterHC4.INSTANCE) .formatStatusLine(null, statline).toString(); } @@ -266,7 +266,7 @@ public class BasicLineFormatter implemen */ public static String formatHeader(final Header header, final LineFormatter formatter) { - return (formatter != null ? formatter : BasicLineFormatter.INSTANCE) + return (formatter != null ? formatter : BasicLineFormatterHC4.INSTANCE) .formatHeader(null, header).toString(); } @@ -316,4 +316,4 @@ public class BasicLineFormatter implemen } -} // class BasicLineFormatter +} // class BasicLineFormatterHC4 Copied: httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/message/BasicLineParserHC4.java (from r1615085, httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/message/BasicLineParser.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/message/BasicLineParserHC4.java?p2=httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/message/BasicLineParserHC4.java&p1=httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/message/BasicLineParser.java&r1=1615085&r2=1615099&rev=1615099&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/message/BasicLineParser.java (original) +++ httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/message/BasicLineParserHC4.java Fri Aug 1 13:45:09 2014 @@ -57,7 +57,7 @@ import org.apache.http.util.CharArrayBuf * @since 4.0 */ @Immutable -public class BasicLineParser implements LineParser { +public class BasicLineParserHC4 implements LineParser { /** * A default instance of this class, for use as default or fallback. @@ -68,9 +68,9 @@ public class BasicLineParser implements * @deprecated (4.3) use {@link #INSTANCE} */ @Deprecated - public final static BasicLineParser DEFAULT = new BasicLineParser(); + public final static BasicLineParserHC4 DEFAULT = new BasicLineParserHC4(); - public final static BasicLineParser INSTANCE = new BasicLineParser(); + public final static BasicLineParserHC4 INSTANCE = new BasicLineParserHC4(); /** * A version of the protocol to parse. @@ -86,7 +86,7 @@ public class BasicLineParser implements * null for HTTP. The actual version * is not relevant, only the protocol name. */ - public BasicLineParser(final ProtocolVersion proto) { + public BasicLineParserHC4(final ProtocolVersion proto) { this.protocol = proto != null? proto : HttpVersion.HTTP_1_1; } @@ -94,7 +94,7 @@ public class BasicLineParser implements /** * Creates a new line parser for HTTP. */ - public BasicLineParser() { + public BasicLineParserHC4() { this(null); } @@ -107,7 +107,7 @@ public class BasicLineParser implements final CharArrayBuffer buffer = new CharArrayBuffer(value.length()); buffer.append(value); final ParserCursor cursor = new ParserCursor(0, value.length()); - return (parser != null ? parser : BasicLineParser.INSTANCE) + return (parser != null ? parser : BasicLineParserHC4.INSTANCE) .parseProtocolVersion(buffer, cursor); } @@ -256,7 +256,7 @@ public class BasicLineParser implements final CharArrayBuffer buffer = new CharArrayBuffer(value.length()); buffer.append(value); final ParserCursor cursor = new ParserCursor(0, value.length()); - return (parser != null ? parser : BasicLineParser.INSTANCE) + return (parser != null ? parser : BasicLineParserHC4.INSTANCE) .parseRequestLine(buffer, cursor); } @@ -343,7 +343,7 @@ public class BasicLineParser implements final CharArrayBuffer buffer = new CharArrayBuffer(value.length()); buffer.append(value); final ParserCursor cursor = new ParserCursor(0, value.length()); - return (parser != null ? parser : BasicLineParser.INSTANCE) + return (parser != null ? parser : BasicLineParserHC4.INSTANCE) .parseStatusLine(buffer, cursor); } @@ -426,7 +426,7 @@ public class BasicLineParser implements final CharArrayBuffer buffer = new CharArrayBuffer(value.length()); buffer.append(value); - return (parser != null ? parser : BasicLineParser.INSTANCE) + return (parser != null ? parser : BasicLineParserHC4.INSTANCE) .parseHeader(buffer); } @@ -453,4 +453,4 @@ public class BasicLineParser implements cursor.updatePos(pos); } -} // class BasicLineParser +} // class BasicLineParserHC4 Modified: httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/params/HttpParamConfig.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/params/HttpParamConfig.java?rev=1615099&r1=1615098&r2=1615099&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/params/HttpParamConfig.java (original) +++ httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/params/HttpParamConfig.java Fri Aug 1 13:45:09 2014 @@ -28,7 +28,6 @@ package org.apache.http.params; import java.nio.charset.Charset; -import java.nio.charset.CodingErrorAction; import org.apache.http.config.ConnectionConfig; import org.apache.http.config.MessageConstraints; @@ -48,8 +47,6 @@ public final class HttpParamConfig { public static SocketConfig getSocketConfig(final HttpParams params) { return SocketConfig.custom() .setSoTimeout(params.getIntParameter(CoreConnectionPNames.SO_TIMEOUT, 0)) - .setSoReuseAddress(params.getBooleanParameter(CoreConnectionPNames.SO_REUSEADDR, false)) - .setSoKeepAlive(params.getBooleanParameter(CoreConnectionPNames.SO_KEEPALIVE, false)) .setSoLinger(params.getIntParameter(CoreConnectionPNames.SO_LINGER, -1)) .setTcpNoDelay(params.getBooleanParameter(CoreConnectionPNames.TCP_NODELAY, true)) .build(); @@ -67,10 +64,6 @@ public final class HttpParamConfig { final String csname = (String) params.getParameter(CoreProtocolPNames.HTTP_ELEMENT_CHARSET); return ConnectionConfig.custom() .setCharset(csname != null ? Charset.forName(csname) : null) - .setMalformedInputAction((CodingErrorAction) - params.getParameter(CoreProtocolPNames.HTTP_MALFORMED_INPUT_ACTION)) - .setMalformedInputAction((CodingErrorAction) - params.getParameter(CoreProtocolPNames.HTTP_UNMAPPABLE_INPUT_ACTION)) .setMessageConstraints(messageConstraints) .build(); } Copied: httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/BasicHttpContextHC4.java (from r1615085, httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/BasicHttpContext.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/BasicHttpContextHC4.java?p2=httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/BasicHttpContextHC4.java&p1=httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/BasicHttpContext.java&r1=1615085&r2=1615099&rev=1615099&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/BasicHttpContext.java (original) +++ httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/BasicHttpContextHC4.java Fri Aug 1 13:45:09 2014 @@ -42,16 +42,16 @@ import org.apache.http.util.Args; * @since 4.0 */ @ThreadSafe -public class BasicHttpContext implements HttpContext { +public class BasicHttpContextHC4 implements HttpContext { private final HttpContext parentContext; private final Map map; - public BasicHttpContext() { + public BasicHttpContextHC4() { this(null); } - public BasicHttpContext(final HttpContext parentContext) { + public BasicHttpContextHC4(final HttpContext parentContext) { super(); this.map = new ConcurrentHashMap(); this.parentContext = parentContext; Modified: httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/HttpCoreContext.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/HttpCoreContext.java?rev=1615099&r1=1615098&r2=1615099&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/HttpCoreContext.java (original) +++ httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/HttpCoreContext.java Fri Aug 1 13:45:09 2014 @@ -75,7 +75,7 @@ public class HttpCoreContext implements public static final String HTTP_REQ_SENT = "http.request_sent"; public static HttpCoreContext create() { - return new HttpCoreContext(new BasicHttpContext()); + return new HttpCoreContext(new BasicHttpContextHC4()); } public static HttpCoreContext adapt(final HttpContext context) { @@ -96,7 +96,7 @@ public class HttpCoreContext implements public HttpCoreContext() { super(); - this.context = new BasicHttpContext(); + this.context = new BasicHttpContextHC4(); } public Object getAttribute(final String id) { Copied: httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestConnControlHC4.java (from r1615085, httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestConnControl.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestConnControlHC4.java?p2=httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestConnControlHC4.java&p1=httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestConnControl.java&r1=1615085&r2=1615099&rev=1615099&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestConnControl.java (original) +++ httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestConnControlHC4.java Fri Aug 1 13:45:09 2014 @@ -36,7 +36,7 @@ import org.apache.http.annotation.Immuta import org.apache.http.util.Args; /** - * RequestConnControl is responsible for adding Connection header + * RequestConnControlHC4 is responsible for adding Connection header * to the outgoing requests, which is essential for managing persistence of * HTTP/1.0 connections. This interceptor is recommended for * client side protocol processors. @@ -44,9 +44,9 @@ import org.apache.http.util.Args; * @since 4.0 */ @Immutable -public class RequestConnControl implements HttpRequestInterceptor { +public class RequestConnControlHC4 implements HttpRequestInterceptor { - public RequestConnControl() { + public RequestConnControlHC4() { super(); } Copied: httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestContentHC4.java (from r1615085, httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestContent.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestContentHC4.java?p2=httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestContentHC4.java&p1=httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestContent.java&r1=1615085&r2=1615099&rev=1615099&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestContent.java (original) +++ httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestContentHC4.java Fri Aug 1 13:45:09 2014 @@ -41,7 +41,7 @@ import org.apache.http.annotation.Immuta import org.apache.http.util.Args; /** - * RequestContent is the most important interceptor for outgoing requests. + * RequestContentHC4 is the most important interceptor for outgoing requests. * It is responsible for delimiting content length by adding * Content-Length or Transfer-Content headers based * on the properties of the enclosed entity and the protocol version. @@ -51,7 +51,7 @@ import org.apache.http.util.Args; * @since 4.0 */ @Immutable -public class RequestContent implements HttpRequestInterceptor { +public class RequestContentHC4 implements HttpRequestInterceptor { private final boolean overwrite; @@ -60,7 +60,7 @@ public class RequestContent implements H * will cause the interceptor to throw {@link ProtocolException} if already present in the * response message. */ - public RequestContent() { + public RequestContentHC4() { this(false); } @@ -75,7 +75,7 @@ public class RequestContent implements H * * @since 4.2 */ - public RequestContent(final boolean overwrite) { + public RequestContentHC4(final boolean overwrite) { super(); this.overwrite = overwrite; } Copied: httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestDateHC4.java (from r1615085, httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestDate.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestDateHC4.java?p2=httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestDateHC4.java&p1=httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestDate.java&r1=1615085&r2=1615099&rev=1615099&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestDate.java (original) +++ httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestDateHC4.java Fri Aug 1 13:45:09 2014 @@ -37,18 +37,18 @@ import org.apache.http.annotation.Thread import org.apache.http.util.Args; /** - * RequestDate interceptor is responsible for adding Date header + * RequestDateHC4 interceptor is responsible for adding Date header * to the outgoing requests This interceptor is optional for client side * protocol processors. * * @since 4.0 */ @ThreadSafe -public class RequestDate implements HttpRequestInterceptor { +public class RequestDateHC4 implements HttpRequestInterceptor { private static final HttpDateGenerator DATE_GENERATOR = new HttpDateGenerator(); - public RequestDate() { + public RequestDateHC4() { super(); } Copied: httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestTargetHostHC4.java (from r1615085, httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestTargetHost.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestTargetHostHC4.java?p2=httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestTargetHostHC4.java&p1=httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestTargetHost.java&r1=1615085&r2=1615099&rev=1615099&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestTargetHost.java (original) +++ httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestTargetHostHC4.java Fri Aug 1 13:45:09 2014 @@ -43,15 +43,15 @@ import org.apache.http.annotation.Immuta import org.apache.http.util.Args; /** - * RequestTargetHost is responsible for adding Host header. This + * RequestTargetHostHC4 is responsible for adding Host header. This * interceptor is required for client side protocol processors. * * @since 4.0 */ @Immutable -public class RequestTargetHost implements HttpRequestInterceptor { +public class RequestTargetHostHC4 implements HttpRequestInterceptor { - public RequestTargetHost() { + public RequestTargetHostHC4() { super(); } Copied: httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestUserAgentHC4.java (from r1615085, httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestUserAgent.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestUserAgentHC4.java?p2=httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestUserAgentHC4.java&p1=httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestUserAgent.java&r1=1615085&r2=1615099&rev=1615099&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestUserAgent.java (original) +++ httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/RequestUserAgentHC4.java Fri Aug 1 13:45:09 2014 @@ -38,23 +38,23 @@ import org.apache.http.params.HttpParams import org.apache.http.util.Args; /** - * RequestUserAgent is responsible for adding User-Agent header. + * RequestUserAgentHC4 is responsible for adding User-Agent header. * This interceptor is recommended for client side protocol processors. * * @since 4.0 */ @SuppressWarnings("deprecation") @Immutable -public class RequestUserAgent implements HttpRequestInterceptor { +public class RequestUserAgentHC4 implements HttpRequestInterceptor { private final String userAgent; - public RequestUserAgent(final String userAgent) { + public RequestUserAgentHC4(final String userAgent) { super(); this.userAgent = userAgent; } - public RequestUserAgent() { + public RequestUserAgentHC4() { this(null); } Copied: httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/ResponseConnControlHC4.java (from r1615085, httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/ResponseConnControl.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/ResponseConnControlHC4.java?p2=httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/ResponseConnControlHC4.java&p1=httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/ResponseConnControl.java&r1=1615085&r2=1615099&rev=1615099&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/ResponseConnControl.java (original) +++ httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/protocol/ResponseConnControlHC4.java Fri Aug 1 13:45:09 2014 @@ -42,7 +42,7 @@ import org.apache.http.annotation.Immuta import org.apache.http.util.Args; /** - * ResponseConnControl is responsible for adding Connection header + * ResponseConnControlHC4 is responsible for adding Connection header * to the outgoing responses, which is essential for managing persistence of * HTTP/1.0 connections. This interceptor is recommended for * server side protocol processors. @@ -50,9 +50,9 @@ import org.apache.http.util.Args; * @since 4.0 */ @Immutable -public class ResponseConnControl implements HttpResponseInterceptor { +public class ResponseConnControlHC4 implements HttpResponseInterceptor { - public ResponseConnControl() { + public ResponseConnControlHC4() { super(); } Copied: httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/util/EntityUtilsHC4.java (from r1615085, httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/util/EntityUtils.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/util/EntityUtilsHC4.java?p2=httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/util/EntityUtilsHC4.java&p1=httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/util/EntityUtils.java&r1=1615085&r2=1615099&rev=1615099&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/util/EntityUtils.java (original) +++ httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/util/EntityUtilsHC4.java Fri Aug 1 13:45:09 2014 @@ -48,9 +48,9 @@ import org.apache.http.protocol.HTTP; * * @since 4.0 */ -public final class EntityUtils { +public final class EntityUtilsHC4 { - private EntityUtils() { + private EntityUtilsHC4() { } /** @@ -235,7 +235,7 @@ public final class EntityUtils { charset = defaultCharset; } if (charset == null) { - charset = HTTP.DEF_CONTENT_CHARSET; + charset = Charset.forName(HTTP.DEFAULT_CONTENT_CHARSET); } final Reader reader = new InputStreamReader(instream, charset); final CharArrayBuffer buffer = new CharArrayBuffer(i); Copied: httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/util/VersionInfoHC4.java (from r1615085, httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/util/VersionInfo.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/util/VersionInfoHC4.java?p2=httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/util/VersionInfoHC4.java&p1=httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/util/VersionInfo.java&r1=1615085&r2=1615099&rev=1615099&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/util/VersionInfo.java (original) +++ httpcomponents/httpclient-android/branches/4.3.5-android/src/main/java/org/apache/http/util/VersionInfoHC4.java Fri Aug 1 13:45:09 2014 @@ -46,7 +46,7 @@ import java.util.Properties; * * @since 4.0 */ -public class VersionInfo { +public class VersionInfoHC4 { /** A string constant for unavailable information. */ public final static String UNAVAILABLE = "UNAVAILABLE"; @@ -85,7 +85,7 @@ public class VersionInfo { * @param time the build time, or null * @param clsldr the class loader, or null */ - protected VersionInfo(final String pckg, final String module, + protected VersionInfoHC4(final String pckg, final String module, final String release, final String time, final String clsldr) { Args.notNull(pckg, "Package identifier"); infoPackage = pckg; @@ -196,9 +196,9 @@ public class VersionInfo { public static VersionInfo[] loadVersionInfo(final String[] pckgs, final ClassLoader clsldr) { Args.notNull(pckgs, "Package identifier array"); - final List vil = new ArrayList(pckgs.length); + final List vil = new ArrayList(pckgs.length); for (final String pckg : pckgs) { - final VersionInfo vi = loadVersionInfo(pckg, clsldr); + final VersionInfoHC4 vi = loadVersionInfo(pckg, clsldr); if (vi != null) { vil.add(vi); } @@ -220,7 +220,7 @@ public class VersionInfo { * @return the version information for the argument package, or * null if not available */ - public static VersionInfo loadVersionInfo(final String pckg, + public static VersionInfoHC4 loadVersionInfo(final String pckg, final ClassLoader clsldr) { Args.notNull(pckg, "Package identifier"); final ClassLoader cl = clsldr != null ? clsldr : Thread.currentThread().getContextClassLoader(); @@ -244,7 +244,7 @@ public class VersionInfo { // shamelessly munch this exception } - VersionInfo result = null; + VersionInfoHC4 result = null; if (vip != null) { result = fromMap(pckg, vip, cl); } @@ -263,7 +263,7 @@ public class VersionInfo { * * @return the version information */ - protected static VersionInfo fromMap(final String pckg, final Map info, + protected static VersionInfoHC4 fromMap(final String pckg, final Map info, final ClassLoader clsldr) { Args.notNull(pckg, "Package identifier"); String module = null; @@ -296,7 +296,7 @@ public class VersionInfo { clsldrstr = clsldr.toString(); } - return new VersionInfo(pckg, module, release, timestamp, clsldrstr); + return new VersionInfoHC4(pckg, module, release, timestamp, clsldrstr); } /** @@ -315,10 +315,10 @@ public class VersionInfo { */ public static String getUserAgent(final String name, final String pkg, final Class cls) { // determine the release version from packaged version info - final VersionInfo vi = VersionInfo.loadVersionInfo(pkg, cls.getClassLoader()); - final String release = (vi != null) ? vi.getRelease() : VersionInfo.UNAVAILABLE; + final VersionInfoHC4 vi = VersionInfoHC4.loadVersionInfo(pkg, cls.getClassLoader()); + final String release = (vi != null) ? vi.getRelease() : VersionInfoHC4.UNAVAILABLE; final String javaVersion = System.getProperty("java.version"); return name + "/" + release + " (Java 1.5 minimum; Java/" + javaVersion + ")"; } -} // class VersionInfo +} // class VersionInfoHC4