You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2016/11/11 11:56:20 UTC
[2/4] brooklyn-server git commit: Fix timeout in
ValueResolver.immediate(false)
Fix timeout in ValueResolver.immediate(false)
If not immediate, should not be setting timeout to 500ms
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/4ef48478
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/4ef48478
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/4ef48478
Branch: refs/heads/master
Commit: 4ef48478e12ad7fe3863deb676f7f815cfd88657
Parents: dff428e
Author: Aled Sage <al...@gmail.com>
Authored: Tue Nov 8 15:44:22 2016 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Fri Nov 11 09:28:04 2016 +0000
----------------------------------------------------------------------
.../java/org/apache/brooklyn/util/core/task/ValueResolver.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4ef48478/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 9ae6893..6775a44 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
@@ -260,7 +260,7 @@ public class ValueResolver<T> implements DeferredSupplier<T> {
@Beta
public ValueResolver<T> immediately(boolean val) {
this.immediately = val;
- if (timeout == null) timeout = ValueResolver.NON_BLOCKING_WAIT;
+ if (val && timeout == null) timeout = ValueResolver.NON_BLOCKING_WAIT;
return this;
}