[prev in list] [next in list] [prev in thread] [next in thread] 

List:       httpcomponents-commits
Subject:    svn commit: r1525568 - in /httpcomponents/httpclient/trunk: RELEASE_NOTES.txt httpclient/src/main/ja
From:       olegk () apache ! org
Date:       2013-09-23 12:27:31
Message-ID: 20130923122731.2472923889D5 () eris ! apache ! org
[Download RAW message or body]

Author: olegk
Date: Mon Sep 23 12:27:30 2013
New Revision: 1525568

URL: http://svn.apache.org/r1525568
Log:
HTTPCLIENT-1402: Cache default User-Agent value
Contributed by yuexiaojun <junedo at qq.com>

Modified:
    httpcomponents/httpclient/trunk/RELEASE_NOTES.txt
    httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultHttpClient.java
  httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java


Modified: httpcomponents/httpclient/trunk/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/RELEASE_NOTES.txt?rev=1525568&r1=1525567&r2=1525568&view=diff
 ==============================================================================
--- httpcomponents/httpclient/trunk/RELEASE_NOTES.txt (original)
+++ httpcomponents/httpclient/trunk/RELEASE_NOTES.txt Mon Sep 23 12:27:30 2013
@@ -1,6 +1,9 @@
 Changes since 4.3
 -------------------
 
+* [HTTPCLIENT-1402] Cache default User-Agent value.
+  Contributed by yuexiaojun <junedo at qq.com> 
+
 * [HTTPCLIENT-1398] Fixed invalid OSGi metadata caused by corrupted Maven bundle \
plugin metadata.  Contributed by Oleg Kalnichevski <olegk at apache.org>
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultHttpClient.java
                
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/ \
java-deprecated/org/apache/http/impl/client/DefaultHttpClient.java?rev=1525568&r1=1525567&r2=1525568&view=diff
 ==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultHttpClient.java \
                (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultHttpClient.java \
Mon Sep 23 12:27:30 2013 @@ -47,7 +47,6 @@ import org.apache.http.protocol.RequestC
 import org.apache.http.protocol.RequestExpectContinue;
 import org.apache.http.protocol.RequestTargetHost;
 import org.apache.http.protocol.RequestUserAgent;
-import org.apache.http.util.VersionInfo;
 
 /**
  * Default implementation of {@link org.apache.http.client.HttpClient} \
pre-configured @@ -181,14 +180,7 @@ public class DefaultHttpClient extends A
         HttpProtocolParams.setContentCharset(params, \
HTTP.DEF_CONTENT_CHARSET.name());  HttpConnectionParams.setTcpNoDelay(params, true);
         HttpConnectionParams.setSocketBufferSize(params, 8192);
-
-        // determine the release version from packaged version info
-        final VersionInfo vi = VersionInfo.loadVersionInfo
-            ("org.apache.http.client", DefaultHttpClient.class.getClassLoader());
-        final String release = (vi != null) ?
-            vi.getRelease() : VersionInfo.UNAVAILABLE;
-        HttpProtocolParams.setUserAgent(params,
-                "Apache-HttpClient/" + release + " (java 1.5)");
+        HttpProtocolParams.setUserAgent(params, \
HttpClientBuilder.DEFAULT_USER_AGENT);  }
 
     /**

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java
                
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/ \
java/org/apache/http/impl/client/HttpClientBuilder.java?rev=1525568&r1=1525567&r2=1525568&view=diff
 ==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java \
                (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java \
Mon Sep 23 12:27:30 2013 @@ -198,6 +198,15 @@ public class HttpClientBuilder {
 
     private List<Closeable> closeables;
 
+    static final String DEFAULT_USER_AGENT;
+    static {
+        final VersionInfo vi = VersionInfo.loadVersionInfo
+                ("org.apache.http.client", \
HttpClientBuilder.class.getClassLoader()); +        final String release = (vi != \
null) ? +                vi.getRelease() : VersionInfo.UNAVAILABLE;
+        DEFAULT_USER_AGENT = "Apache-HttpClient/" + release + " (java 1.5)";
+    }
+
     public static HttpClientBuilder create() {
         return new HttpClientBuilder();
     }
@@ -788,10 +797,7 @@ public class HttpClientBuilder {
                     userAgent = System.getProperty("http.agent");
                 }
                 if (userAgent == null) {
-                    final VersionInfo vi = \
                VersionInfo.loadVersionInfo("org.apache.http.client",
-                            HttpClientBuilder.class.getClassLoader());
-                    final String release = vi != null ? vi.getRelease() : \
                VersionInfo.UNAVAILABLE;
-                    userAgent = "Apache-HttpClient/" + release + " (java 1.5)";
+                    userAgent = DEFAULT_USER_AGENT;
                 }
             }
 


[prev in list] [next in list] [prev in thread] [next in thread]