Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Job into Call. CallTest = AsyncApiTest + SyncApiTest #764

Merged
merged 1 commit into from
Apr 25, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class OkHttpAsync implements HttpClient {

@Override public void enqueue(URL url) throws Exception {
requestsInFlight.incrementAndGet();
client.call(new Request.Builder().tag(System.nanoTime()).url(url).build()).execute(callback);
client.newCall(new Request.Builder().tag(System.nanoTime()).url(url).build()).execute(callback);
}

@Override public synchronized boolean acceptingJobs() {
Expand Down
2 changes: 1 addition & 1 deletion okcurl/src/main/java/com/squareup/okhttp/curl/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ private static String protocols() {
client = createClient();
Request request = createRequest();
try {
Response response = client.execute(request);
Response response = client.newCall(request).execute();
if (showHeaders) {
System.out.println(StatusLine.get(response));
Headers headers = response.headers();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public OkApacheClient(OkHttpClient client) {
@Override public HttpResponse execute(HttpHost host, HttpRequest request, HttpContext context)
throws IOException {
Request okRequest = transformRequest(request);
Response okResponse = client.execute(okRequest);
Response okResponse = client.newCall(okRequest).execute();
return transformResponse(okResponse);
}

Expand Down
Loading