Invoke callback first then signal future

Azure · Aug 11, 2016 · 5b2c095 · 5b2c095
1 parent 61e0635
commit 5b2c095
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/...management/resources/fluentcore/arm/collection/implementation/CreatableResourcesImpl.java b/...management/resources/fluentcore/arm/collection/implementation/CreatableResourcesImpl.java
@@ -38,7 +38,6 @@ protected CreatableResourcesImpl() {
     @SafeVarargs
     public final CreatedResources<T> create(Creatable<T> ... creatables) throws Exception {
         ServiceCall<CreatedResources<T>> serviceCall = createAsync(null, creatables);
-        serviceCall.wait();
         return serviceCall.get().getBody();
     }
 
@@ -326,18 +325,18 @@ ServiceCallback<CreatableResourcesRoot<T>> wrapCallback(final ServiceCallback<Cr
             return new ServiceCallback<CreatableResourcesRoot<T>>() {
                 @Override
                 public void failure(Throwable t) {
-                    self.failure(t);
                     if (innerCallback != null) {
                         innerCallback.failure((t));
                     }
+                    self.failure(t); // Signal Future
                 }
 
                 @Override
                 public void success(ServiceResponse<CreatableResourcesRoot<T>> result) {
-                    self.success(new ServiceResponse<CreatedResources<T>>(new CreatedResourcesImpl<>(result.getBody()), null));
                     if (innerCallback != null) {
                         innerCallback.success(new ServiceResponse<CreatedResources<T>>(new CreatedResourcesImpl<>(result.getBody()), null));
                     }
+                    self.success(new ServiceResponse<CreatedResources<T>>(new CreatedResourcesImpl<>(result.getBody()), null)); // Signal Future
                 }
             };
         }

diff --git a/...osoft/azure/management/resources/fluentcore/model/implementation/ResourceServiceCall.java b/...osoft/azure/management/resources/fluentcore/model/implementation/ResourceServiceCall.java
@@ -55,8 +55,8 @@ public void failure(Throwable t) {
                 if (self.failureHandler != null) {
                     self.failureHandler.failure(t);
                 }
-                self.failure(t);
                 callback.failure(t);
+                self.failure(t); // Signal Future
             }
 
             @Override
@@ -66,8 +66,8 @@ public void success(ServiceResponse<InnerModelT> response) {
                     self.successHandler.success(response);
                 }
                 if (reportSuccess) {
-                    self.success(new ServiceResponse<Resource>(self.fluentModelImpl, response.getResponse()));
                     callback.success(new ServiceResponse<Resource>(self.fluentModelImpl, response.getResponse()));
+                    self.success(new ServiceResponse<Resource>(self.fluentModelImpl, response.getResponse())); // Signal Future
                 }
             }
         };