From a5562b4e98c2f8029a066dc21493a29e4314dd07 Mon Sep 17 00:00:00 2001
From: Dmitry Potapov <dpotapov@yandex-team.ru>
Date: Wed, 3 Jun 2015 19:37:38 +0300
Subject: [PATCH 1/3] Cache request line in HttpRequestWrapper

---
 .../client/methods/HttpRequestWrapper.java    | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestWrapper.java b/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestWrapper.java
index d9adfd2e3e..967cd9a821 100644
--- a/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestWrapper.java
+++ b/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestWrapper.java
@@ -54,6 +54,7 @@ public class HttpRequestWrapper extends AbstractHttpMessage implements HttpUriRe
     private final HttpRequest original;
     private final HttpHost target;
     private final String method;
+    private RequestLine cachedRequestLine = null;
     private ProtocolVersion version;
     private URI uri;
 
@@ -78,6 +79,7 @@ public ProtocolVersion getProtocolVersion() {
 
     public void setProtocolVersion(final ProtocolVersion version) {
         this.version = version;
+        cachedRequestLine = null;
     }
 
     @Override
@@ -87,6 +89,7 @@ public URI getURI() {
 
     public void setURI(final URI uri) {
         this.uri = uri;
+        cachedRequestLine = null;
     }
 
     @Override
@@ -106,16 +109,19 @@ public boolean isAborted() {
 
     @Override
     public RequestLine getRequestLine() {
-        String requestUri = null;
-        if (this.uri != null) {
-            requestUri = this.uri.toASCIIString();
-        } else {
-            requestUri = this.original.getRequestLine().getUri();
-        }
-        if (requestUri == null || requestUri.isEmpty()) {
-            requestUri = "/";
+        if (cachedRequestLine == null) {
+            String requestUri = null;
+            if (this.uri != null) {
+                requestUri = this.uri.toASCIIString();
+            } else {
+                requestUri = this.original.getRequestLine().getUri();
+            }
+            if (requestUri == null || requestUri.isEmpty()) {
+                requestUri = "/";
+            }
+            cachedRequestLine = new BasicRequestLine(this.method, requestUri, getProtocolVersion());
         }
-        return new BasicRequestLine(this.method, requestUri, getProtocolVersion());
+        return cachedRequestLine;
     }
 
     public HttpRequest getOriginal() {

From 389948f41bc0dc3fe2b719aa7e3d0c84121b9894 Mon Sep 17 00:00:00 2001
From: Dmitry Potapov <dpotapov@yandex-team.ru>
Date: Wed, 3 Jun 2015 19:55:22 +0300
Subject: [PATCH 2/3] Style fix

---
 .../org/apache/http/client/methods/HttpRequestWrapper.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestWrapper.java b/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestWrapper.java
index 967cd9a821..0e62e79587 100644
--- a/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestWrapper.java
+++ b/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestWrapper.java
@@ -109,7 +109,7 @@ public boolean isAborted() {
 
     @Override
     public RequestLine getRequestLine() {
-        if (cachedRequestLine == null) {
+        if (this.cachedRequestLine == null) {
             String requestUri = null;
             if (this.uri != null) {
                 requestUri = this.uri.toASCIIString();
@@ -119,9 +119,9 @@ public RequestLine getRequestLine() {
             if (requestUri == null || requestUri.isEmpty()) {
                 requestUri = "/";
             }
-            cachedRequestLine = new BasicRequestLine(this.method, requestUri, getProtocolVersion());
+            this.cachedRequestLine = new BasicRequestLine(this.method, requestUri, getProtocolVersion());
         }
-        return cachedRequestLine;
+        return this.cachedRequestLine;
     }
 
     public HttpRequest getOriginal() {

From 2828b65d4185256b536a32cd214876191ff1552c Mon Sep 17 00:00:00 2001
From: Dmitry Potapov <dpotapov@yandex-team.ru>
Date: Wed, 3 Jun 2015 20:00:38 +0300
Subject: [PATCH 3/3] Style fix v2

---
 .../org/apache/http/client/methods/HttpRequestWrapper.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestWrapper.java b/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestWrapper.java
index 0e62e79587..8d2dd34ff8 100644
--- a/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestWrapper.java
+++ b/httpclient/src/main/java/org/apache/http/client/methods/HttpRequestWrapper.java
@@ -79,7 +79,7 @@ public ProtocolVersion getProtocolVersion() {
 
     public void setProtocolVersion(final ProtocolVersion version) {
         this.version = version;
-        cachedRequestLine = null;
+        this.cachedRequestLine = null;
     }
 
     @Override
@@ -89,7 +89,7 @@ public URI getURI() {
 
     public void setURI(final URI uri) {
         this.uri = uri;
-        cachedRequestLine = null;
+        this.cachedRequestLine = null;
     }
 
     @Override