android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2026-01-17 08:42:25 +03:00
Code Releases Activity

Merge pull request #1469 from nashira/master

Browse Source 
null out Request.Builder.url when setting urlString
This commit is contained in:
Jesse Wilson
2015-03-06 13:05:36 -05:00
parent cba15c8bc1 7e5da6b0ad
commit efcc2df358
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
okhttp-tests/src/test/java/com/squareup/okhttp/RequestTest.java
View File

@@ -114,6 +114,18 @@ public final class RequestTest {
assertEquals(new URL("http://localhost/api"), request.url());
}
@Test public void newBuilderUrlResetsUrl() throws Exception {
Request requestWithoutCache = new Request.Builder().url("http://localhost/api").build();
Request builtRequestWithoutCache = requestWithoutCache.newBuilder().url("http://localhost/api/foo").build();
assertEquals(new URL("http://localhost/api/foo"), builtRequestWithoutCache.url());
Request requestWithCache = new Request.Builder().url("http://localhost/api").build();
// cache url object
requestWithCache.url();
Request builtRequestWithCache = requestWithCache.newBuilder().url("http://localhost/api/foo").build();
assertEquals(new URL("http://localhost/api/foo"), builtRequestWithCache.url());
}
@Test public void cacheControl() throws Exception {
Request request = new Request.Builder()
.cacheControl(new CacheControl.Builder().noCache().build())

3
okhttp/src/main/java/com/squareup/okhttp/Request.java
View File

@@ -146,7 +146,8 @@ public final class Request {
public Builder url(String url) {
if (url == null) throw new IllegalArgumentException("url == null");
urlString = url;
this.urlString = url;
this.url = null;
return this;
}