Merge pull request Azure#43 from Azure/sdk_1007

[Automatic PR] SDK changes from pull request Azure#1007
sima-zhu · Aug 10, 2016 · e32f486 · e32f486
2 parents 804c07b + 6f4812f
commit e32f486
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/azure-client-runtime/src/main/java/com/microsoft/azure/AzureClient.java b/azure-client-runtime/src/main/java/com/microsoft/azure/AzureClient.java
@@ -840,7 +840,10 @@ class PostDeletePollingTask<T> extends AsyncPollingTask<T> {
             this.pollingCallback = new ServiceCallback<T>() {
                 @Override
                 public void failure(Throwable t) {
-                    clientCallback.failure(t);
+                    if (clientCallback != null) {
+                        clientCallback.failure(t);
+                    }
+                    serviceCall.failure(t);
                 }
 
                 @Override
@@ -863,17 +866,20 @@ public void run() {
                 } else {
                     ServiceException serviceException = new ServiceException("No async header in response");
                     pollingCallback.failure(serviceException);
-                    serviceCall.failure(serviceException);
                 }
             } else {
                 // Check if operation failed
                 if (AzureAsyncOperation.getFailedStatuses().contains(pollingState.getStatus())) {
                     ServiceException serviceException = new ServiceException("Async operation failed");
-                    clientCallback.failure(serviceException);
+                    if (clientCallback != null) {
+                        clientCallback.failure(serviceException);
+                    }
                     serviceCall.failure(serviceException);
                 } else {
                     ServiceResponse<T> serviceResponse = new ServiceResponse<>(pollingState.getResource(), pollingState.getResponse());
-                    clientCallback.success(serviceResponse);
+                    if (clientCallback != null) {
+                        clientCallback.success(serviceResponse);
+                    }
                     serviceCall.success(serviceResponse);
                 }
             }

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
@@ -68,7 +68,7 @@ public void execute() throws Exception {
     }
 
     @Override
-    public ServiceCall executeAsync(final ServiceCallback<T> callback) {
+    public ServiceCall<T> executeAsync(final ServiceCallback<T> callback) {
         executeReadyTasksAsync(callback);
         return parallelServiceCall;
     }
@@ -107,13 +107,17 @@ private ServiceCallback<T> taskCallback(final DAGNode<U> taskNode, final Service
             @Override
             public void failure(Throwable t) {
                 callback.failure(t);
+                parallelServiceCall.failure(t);
             }
 
             @Override
             public void success(ServiceResponse<T> result) {
                 self.dag().reportedCompleted(taskNode);
                 if (self.dag().isRootNode(taskNode)) {
-                    callback.success(result);
+                    if (callback != null) {
+                        callback.success(result);
+                    }
+                    parallelServiceCall.success(result);
                 } else {
                     self.executeReadyTasksAsync(callback);
                 }
@@ -124,8 +128,8 @@ public void success(ServiceResponse<T> result) {
     /**
      * Type represents a set of REST calls running possibly in parallel.
      */
-    private class ParallelServiceCall extends ServiceCall {
-        private ConcurrentLinkedQueue<ServiceCall> serviceCalls;
+    private class ParallelServiceCall extends ServiceCall<T> {
+        private ConcurrentLinkedQueue<ServiceCall<?>> serviceCalls;
 
         /**
          * Creates a ParallelServiceCall.
@@ -139,7 +143,7 @@ private class ParallelServiceCall extends ServiceCall {
          * Cancels all the service calls currently executing.
          */
         public void cancel() {
-            for (ServiceCall call : this.serviceCalls) {
+            for (ServiceCall<?> call : this.serviceCalls) {
                 call.cancel();
             }
         }
@@ -148,7 +152,7 @@ public void cancel() {
          * @return true if the call has been canceled; false otherwise.
          */
         public boolean isCancelled() {
-            for (ServiceCall call : this.serviceCalls) {
+            for (ServiceCall<?> call : this.serviceCalls) {
                 if (!call.isCanceled()) {
                     return false;
                 }
@@ -161,7 +165,7 @@ public boolean isCancelled() {
          *
          * @param call the call
          */
-        private void addCall(ServiceCall call) {
+        private void addCall(ServiceCall<?> call) {
             this.serviceCalls.add(call);
         }
     }