Repository: brooklyn-server Updated Branches: refs/heads/master 757a38cc4 -> b84ec0231
Fix DslYamlTestâs getConfigEventually Call config().get(), and then config.getNonBlocking(). Previously did it the other way around, so the getNonBlocking could return absent if the value was not yet available. Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/a4b13773 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/a4b13773 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/a4b13773 Branch: refs/heads/master Commit: a4b137730c9f08a61cb82aafacaea2fd1dc3ada7 Parents: 757a38c Author: Aled Sage <[email protected]> Authored: Wed May 24 12:43:35 2017 +0100 Committer: Aled Sage <[email protected]> Committed: Wed May 24 12:43:35 2017 +0100 ---------------------------------------------------------------------- .../org/apache/brooklyn/camp/brooklyn/spi/dsl/DslYamlTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/a4b13773/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslYamlTest.java ---------------------------------------------------------------------- diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslYamlTest.java index 5eba70a..c8463e6 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslYamlTest.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/DslYamlTest.java @@ -763,8 +763,8 @@ public class DslYamlTest extends AbstractYamlTest { public T call() throws Exception { // TODO Move the getNonBlocking call out of the task after #480 is merged. // Currently doesn't work because no execution context available. - Maybe<T> immediateValue = ((EntityInternal)entity).config().getNonBlocking(configKey); T blockingValue = entity.config().get(configKey); + Maybe<T> immediateValue = ((EntityInternal)entity).config().getNonBlocking(configKey); assertEquals(immediateValue.get(), blockingValue); return blockingValue; }
