Repository: brooklyn-server Updated Branches: refs/heads/master aae721865 -> f4999be95
don't wait on generic incomplete Future items when evaluating immediately Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/bf69b0c0 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/bf69b0c0 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/bf69b0c0 Branch: refs/heads/master Commit: bf69b0c0b8d0ce482592f41de6582fdbccf2c01f Parents: 20f4908 Author: Alex Heneveld <[email protected]> Authored: Tue Apr 25 15:07:20 2017 +0100 Committer: Alex Heneveld <[email protected]> Committed: Fri Apr 28 14:09:50 2017 +0100 ---------------------------------------------------------------------- .../java/org/apache/brooklyn/util/core/task/ValueResolver.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/bf69b0c0/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java b/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java index ffaa817..afd6109 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java @@ -443,6 +443,10 @@ public class ValueResolver<T> implements DeferredSupplier<T>, Iterable<Maybe<Obj //including tasks, above if (!vfuture.isDone()) { + if (isEvaluatingImmediately()) { + return ImmediateSupplier.ImmediateValueNotAvailableException.newAbsentWithExceptionSupplier(); + } + Callable<Maybe> callable = new Callable<Maybe>() { @Override public Maybe call() throws Exception {
