Fix NPE in AbstractController.update Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/1efe7287 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/1efe7287 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/1efe7287
Branch: refs/heads/0.6.0 Commit: 1efe72870056ce96cafe925d9da922a6d51accaf Parents: c2b9bc3 Author: Aled Sage <[email protected]> Authored: Fri Nov 15 10:53:03 2013 +0000 Committer: Aled Sage <[email protected]> Committed: Fri Nov 15 10:53:03 2013 +0000 ---------------------------------------------------------------------- .../main/java/brooklyn/entity/proxy/AbstractControllerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/1efe7287/software/webapp/src/main/java/brooklyn/entity/proxy/AbstractControllerImpl.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/main/java/brooklyn/entity/proxy/AbstractControllerImpl.java b/software/webapp/src/main/java/brooklyn/entity/proxy/AbstractControllerImpl.java index 9679e12..95ac997 100644 --- a/software/webapp/src/main/java/brooklyn/entity/proxy/AbstractControllerImpl.java +++ b/software/webapp/src/main/java/brooklyn/entity/proxy/AbstractControllerImpl.java @@ -268,7 +268,7 @@ public abstract class AbstractControllerImpl extends SoftwareProcessImpl impleme @Override public void update() { Task<?> task = updateAsync(); - task.getUnchecked(); + if (task != null) task.getUnchecked(); } public synchronized Task<?> updateAsync() {
