Merge pull request Azure#1056 from anuchandy/applyAsyncFix

[Ready for review] applyAsync on a root resource should create a dependency resource onl…
jianghaolu · Sep 6, 2016 · cc5fdb3 · cc5fdb3
2 parents 09b070f + 7ff0d2f
commit cc5fdb3
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 22 deletions.
diff --git a/...microsoft/azure/management/resources/fluentcore/model/implementation/CreatorTaskItem.java b/...microsoft/azure/management/resources/fluentcore/model/implementation/CreatorTaskItem.java
@@ -30,17 +30,13 @@ public ResourceT result() {
 
     @Override
     public Observable<ResourceT> executeAsync() {
-        if (this.created == null) {
-            return this.resourceCreator.createResourceAsync()
-                    .subscribeOn(Schedulers.io())
-                    .doOnNext(new Action1<ResourceT>() {
-                        @Override
-                        public void call(ResourceT resourceT) {
-                            created = resourceT;
-                        }
-                    });
-        } else {
-            return Observable.just(created);
-        }
+        return this.resourceCreator.createResourceAsync()
+                .subscribeOn(Schedulers.io())
+                .doOnNext(new Action1<ResourceT>() {
+                    @Override
+                    public void call(ResourceT resourceT) {
+                        created = resourceT;
+                    }
+                });
     }
 }
diff --git a/runtimes/azure-client-runtime/src/main/java/com/microsoft/azure/TaskGroupBase.java b/runtimes/azure-client-runtime/src/main/java/com/microsoft/azure/TaskGroupBase.java
@@ -64,18 +64,31 @@ public Observable<T> executeAsync() {
         final List<Observable<T>> observables = new ArrayList<>();
         while (nextNode != null) {
             final DAGNode<U> thisNode = nextNode;
-            observables.add(nextNode.data().executeAsync()
-                    .flatMap(new Func1<T, Observable<T>>() {
-                        @Override
-                        public Observable<T> call(T t) {
-                            dag().reportedCompleted(thisNode);
-                            if (dag().isRootNode(thisNode)) {
-                                return Observable.just(t);
-                            } else {
+            T cachedResult = nextNode.data().result();
+            if (cachedResult != null && !this.dag().isRootNode(nextNode)) {
+                observables.add(Observable.just(cachedResult)
+                        .flatMap(new Func1<T, Observable<T>>() {
+                            @Override
+                            public Observable<T> call(T t) {
+                                dag().reportedCompleted(thisNode);
                                 return executeAsync();
                             }
-                        }
-                    }));
+                        })
+                );
+            } else {
+                observables.add(nextNode.data().executeAsync()
+                        .flatMap(new Func1<T, Observable<T>>() {
+                            @Override
+                            public Observable<T> call(T t) {
+                                dag().reportedCompleted(thisNode);
+                                if (dag().isRootNode(thisNode)) {
+                                    return Observable.just(t);
+                                } else {
+                                    return executeAsync();
+                                }
+                            }
+                        }));
+            }
             nextNode = dag.getNext();
         }
         return Observable.merge(observables);