From 33a4f0fcdfeb0404d2fe7ed5719e99262850168a Mon Sep 17 00:00:00 2001
From: CuiBaosen <baosencumt@126.com>
Date: Tue, 7 Feb 2017 11:10:04 +0800
Subject: [PATCH 1/2] When path is null or '', URIBuilder.toString() return ''
 rather than '/'.

---
 .../org/apache/http/client/utils/URIBuilder.java   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java b/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java
index baf7122f34..5dae793cb0 100644
--- a/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java
+++ b/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java
@@ -26,6 +26,11 @@
  */
 package org.apache.http.client.utils;
 
+import org.apache.http.Consts;
+import org.apache.http.NameValuePair;
+import org.apache.http.conn.util.InetAddressUtils;
+import org.apache.http.message.BasicNameValuePair;
+
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.charset.Charset;
@@ -33,11 +38,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.http.Consts;
-import org.apache.http.NameValuePair;
-import org.apache.http.conn.util.InetAddressUtils;
-import org.apache.http.message.BasicNameValuePair;
-
 /**
  * Builder for {@link URI} instances.
  *
@@ -492,8 +492,8 @@ public String toString() {
 
     private static String normalizePath(final String path) {
         String s = path;
-        if (s == null) {
-            return "/";
+        if (s == null || "".equals(s)) {
+            return "";
         }
         int n = 0;
         for (; n < s.length(); n++) {

From 76e6690a7c71b277993bf7301619ccf4b538f6c5 Mon Sep 17 00:00:00 2001
From: CuiBaosen <baosencumt@126.com>
Date: Wed, 8 Feb 2017 08:23:26 +0800
Subject: [PATCH 2/2] use TextUtils

---
 .../org/apache/http/client/utils/URIBuilder.java    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java b/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java
index 5dae793cb0..974d34e5cb 100644
--- a/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java
+++ b/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java
@@ -26,11 +26,6 @@
  */
 package org.apache.http.client.utils;
 
-import org.apache.http.Consts;
-import org.apache.http.NameValuePair;
-import org.apache.http.conn.util.InetAddressUtils;
-import org.apache.http.message.BasicNameValuePair;
-
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.charset.Charset;
@@ -38,6 +33,12 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.http.Consts;
+import org.apache.http.NameValuePair;
+import org.apache.http.conn.util.InetAddressUtils;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.TextUtils;
+
 /**
  * Builder for {@link URI} instances.
  *
@@ -492,7 +493,7 @@ public String toString() {
 
     private static String normalizePath(final String path) {
         String s = path;
-        if (s == null || "".equals(s)) {
+        if (TextUtils.isBlank(s)) {
             return "";
         }
         int n = 0;