Don't re-concatenate in getBaseUrl

slandelle · slandelle · commit 3d3918543387 · 2015-11-23T14:20:40.000+01:00
diff --git a/client/src/main/java/org/asynchttpclient/util/HttpUtils.java b/client/src/main/java/org/asynchttpclient/util/HttpUtils.java
@@ -39,12 +39,12 @@ public static final void validateSupportedScheme(Uri uri) {
     }
 
     public final static String getBaseUrl(Uri uri) {
-        return uri.getScheme() + "://" + getAuthority(uri);
+        // getAuthority duplicate but we don't want to re-concatenate
+        return uri.getScheme() + "://" + uri.getHost() + ":" + uri.getExplicitPort();
     }
 
     public final static String getAuthority(Uri uri) {
-        int port = uri.getPort() != -1 ? uri.getPort() : uri.getExplicitPort();
-        return uri.getHost() + ":" + port;
+        return uri.getHost() + ":" + uri.getExplicitPort();
     }
 
     public final static boolean isSameBase(Uri uri1, Uri uri2) {

Original file line number	Diff line number	Diff line change
`@@ -39,12 +39,12 @@ public static final void validateSupportedScheme(Uri uri) {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public final static String getBaseUrl(Uri uri) {`
`42`		`- return uri.getScheme() + "://" + getAuthority(uri);`
	`42`	`+ // getAuthority duplicate but we don't want to re-concatenate`
	`43`	`+ return uri.getScheme() + "://" + uri.getHost() + ":" + uri.getExplicitPort();`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`public final static String getAuthority(Uri uri) {`
`46`		`- int port = uri.getPort() != -1 ? uri.getPort() : uri.getExplicitPort();`
`47`		`- return uri.getHost() + ":" + port;`
	`47`	`+ return uri.getHost() + ":" + uri.getExplicitPort();`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`public final static boolean isSameBase(Uri uri1, Uri uri2) {`