Fixed stc to properly account for skipped steps when completing enclosing group.
Change-Id: I9b297f8a48a9f4423e34fbbb954bf039e98e29b8
Showing
1 changed file
with
2 additions
and
2 deletions
| ... | @@ -217,8 +217,8 @@ public class Coordinator { | ... | @@ -217,8 +217,8 @@ public class Coordinator { |
| 217 | if (step instanceof Group) { | 217 | if (step instanceof Group) { |
| 218 | Group group = (Group) step; | 218 | Group group = (Group) step; |
| 219 | group.children().forEach(child -> delegate.onCompletion(child, SKIPPED)); | 219 | group.children().forEach(child -> delegate.onCompletion(child, SKIPPED)); |
| 220 | - delegate.onCompletion(step, SKIPPED); | ||
| 221 | } | 220 | } |
| 221 | + delegate.onCompletion(step, SKIPPED); | ||
| 222 | } | 222 | } |
| 223 | } | 223 | } |
| 224 | 224 | ||
| ... | @@ -268,7 +268,7 @@ public class Coordinator { | ... | @@ -268,7 +268,7 @@ public class Coordinator { |
| 268 | boolean failed = false; | 268 | boolean failed = false; |
| 269 | for (Step child : group.children()) { | 269 | for (Step child : group.children()) { |
| 270 | Status status = store.getStatus(child); | 270 | Status status = store.getStatus(child); |
| 271 | - done = done && (status == SUCCEEDED || status == FAILED); | 271 | + done = done && (status == SUCCEEDED || status == FAILED || status == SKIPPED); |
| 272 | failed = failed || status == FAILED; | 272 | failed = failed || status == FAILED; |
| 273 | } | 273 | } |
| 274 | if (done) { | 274 | if (done) { | ... | ... |
-
Please register or login to post a comment