Skip to content

Commit 78f4200

Browse files
committed
Merge pull request android-async-http#420 from orientalsensation/getUrlWithQueryString
Only add the query string if it's not empty and it's not equal to '?'
2 parents edc8e0c + 26696b6 commit 78f4200

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

library/src/main/java/com/loopj/android/http/AsyncHttpClient.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -941,11 +941,15 @@ public static String getUrlWithQueryString(boolean shouldEncodeUrl, String url,
941941
url = url.replace(" ", "%20");
942942

943943
if (params != null) {
944-
String paramString = params.getParamString();
945-
if (!url.contains("?")) {
946-
url += "?" + paramString;
947-
} else {
948-
url += "&" + paramString;
944+
// Construct the query string and trim it, in case it
945+
// includes any excessive white spaces.
946+
String paramString = params.getParamString().trim();
947+
948+
// Only add the query string if it isn't empty and it
949+
// isn't equal to '?'.
950+
if (!paramString.equals("") && !paramString.equals("?")) {
951+
url += url.contains("?") ? "&" : "?";
952+
url += paramString;
949953
}
950954
}
951955

0 commit comments

Comments
 (0)