URIBuilder.java (httpcomponents-client-4.5.6-src) | : | URIBuilder.java (httpcomponents-client-4.5.7-src) | ||
---|---|---|---|---|
skipping to change at line 174 | skipping to change at line 174 | |||
sb.append("#").append(encodeUric(this.fragment)); | sb.append("#").append(encodeUric(this.fragment)); | |||
} | } | |||
return sb.toString(); | return sb.toString(); | |||
} | } | |||
private static String normalizePath(final String path, final boolean relativ e) { | private static String normalizePath(final String path, final boolean relativ e) { | |||
String s = path; | String s = path; | |||
if (TextUtils.isBlank(s)) { | if (TextUtils.isBlank(s)) { | |||
return ""; | return ""; | |||
} | } | |||
int n = 0; | ||||
for (; n < s.length(); n++) { | ||||
if (s.charAt(n) != '/') { | ||||
break; | ||||
} | ||||
} | ||||
if (n > 1) { | ||||
s = s.substring(n - 1); | ||||
} | ||||
if (!relative && !s.startsWith("/")) { | if (!relative && !s.startsWith("/")) { | |||
s = "/" + s; | s = "/" + s; | |||
} | } | |||
return s; | return s; | |||
} | } | |||
private void digestURI(final URI uri) { | private void digestURI(final URI uri) { | |||
this.scheme = uri.getScheme(); | this.scheme = uri.getScheme(); | |||
this.encodedSchemeSpecificPart = uri.getRawSchemeSpecificPart(); | this.encodedSchemeSpecificPart = uri.getRawSchemeSpecificPart(); | |||
this.encodedAuthority = uri.getRawAuthority(); | this.encodedAuthority = uri.getRawAuthority(); | |||
skipping to change at line 498 | skipping to change at line 489 | |||
public int getPort() { | public int getPort() { | |||
return this.port; | return this.port; | |||
} | } | |||
public String getPath() { | public String getPath() { | |||
return this.path; | return this.path; | |||
} | } | |||
public List<NameValuePair> getQueryParams() { | public List<NameValuePair> getQueryParams() { | |||
if (this.queryParams != null) { | return this.queryParams != null | |||
return new ArrayList<NameValuePair>(this.queryParams); | ? new ArrayList<NameValuePair>(this.queryParams) | |||
} else { | : new ArrayList<NameValuePair>(); | |||
return new ArrayList<NameValuePair>(); | ||||
} | ||||
} | } | |||
public String getFragment() { | public String getFragment() { | |||
return this.fragment; | return this.fragment; | |||
} | } | |||
@Override | @Override | |||
public String toString() { | public String toString() { | |||
return buildString(); | return buildString(); | |||
} | } | |||
End of changes. 2 change blocks. | ||||
14 lines changed or deleted | 3 lines changed or added |