From 7fb2d38d080719060b75cb9e183341ed6f3ee99c Mon Sep 17 00:00:00 2001 From: Jianghao Lu Date: Mon, 29 Aug 2016 11:48:11 -0700 Subject: [PATCH] Fix socket timeout and parallel creation --- .../src/main/java/com/microsoft/azure/RestClient.java | 1 + .../src/main/java/com/microsoft/azure/TaskGroupBase.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/azure-client-runtime/src/main/java/com/microsoft/azure/RestClient.java b/azure-client-runtime/src/main/java/com/microsoft/azure/RestClient.java index ad9ecf9e92d92..8ff7d89c4c21a 100644 --- a/azure-client-runtime/src/main/java/com/microsoft/azure/RestClient.java +++ b/azure-client-runtime/src/main/java/com/microsoft/azure/RestClient.java @@ -169,6 +169,7 @@ public Builder(OkHttpClient.Builder httpClientBuilder, Retrofit.Builder retrofit // Set up OkHttp client this.httpClientBuilder = httpClientBuilder .cookieJar(new JavaNetCookieJar(cookieManager)) + .readTimeout(30, TimeUnit.SECONDS) .addInterceptor(userAgentInterceptor); this.retrofitBuilder = retrofitBuilder; this.buildable = new Buildable(); diff --git a/azure-client-runtime/src/main/java/com/microsoft/azure/TaskGroupBase.java b/azure-client-runtime/src/main/java/com/microsoft/azure/TaskGroupBase.java index d5a3a6250d2ca..46fe8d0f179f2 100644 --- a/azure-client-runtime/src/main/java/com/microsoft/azure/TaskGroupBase.java +++ b/azure-client-runtime/src/main/java/com/microsoft/azure/TaskGroupBase.java @@ -70,7 +70,7 @@ public void execute() throws Exception { @Override public Observable executeAsync() { - return executeReadyTasksAsync(); + return executeReadyTasksAsync().last(); } @Override @@ -101,6 +101,6 @@ public Observable call(T t) { })); nextNode = dag.getNext(); } - return Observable.merge(observables).last(); + return Observable.merge(observables); } }