add needed cast for setConfig(key, null) it had moved, not been removed (when #470 was merged)
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/5d715979 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/5d715979 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/5d715979 Branch: refs/heads/master Commit: 5d715979e21004bf3b2c6a1d64b7a78a4e56c1a4 Parents: 1197202 Author: Alex Heneveld <[email protected]> Authored: Thu Jan 29 17:17:22 2015 +0000 Committer: Alex Heneveld <[email protected]> Committed: Thu Jan 29 17:17:22 2015 +0000 ---------------------------------------------------------------------- .../effector/BrooklynNodeUpgradeEffectorBody.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5d715979/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/BrooklynNodeUpgradeEffectorBody.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/BrooklynNodeUpgradeEffectorBody.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/BrooklynNodeUpgradeEffectorBody.java index ea20b9a..c939378 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/BrooklynNodeUpgradeEffectorBody.java +++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/effector/BrooklynNodeUpgradeEffectorBody.java @@ -18,9 +18,7 @@ */ package brooklyn.entity.brooklynnode.effector; -import java.util.Collection; import java.util.Map; -import java.util.NoSuchElementException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,8 +41,6 @@ import brooklyn.entity.effector.Effectors; import brooklyn.entity.proxying.EntitySpec; import brooklyn.entity.software.SshEffectorTasks; import brooklyn.event.basic.MapConfigKey; -import brooklyn.location.Location; -import brooklyn.location.basic.SshMachineLocation; import brooklyn.management.ha.HighAvailabilityMode; import brooklyn.management.ha.ManagementNodeState; import brooklyn.util.config.ConfigBag; @@ -147,8 +143,8 @@ public class BrooklynNodeUpgradeEffectorBody extends EffectorBody<Void> { @Override public void run() { DynamicTasks.waitForLast(); - ((EntityInternal)entity()).setAttribute(SoftwareProcess.INSTALL_DIR, null); - entity().setConfig(SoftwareProcess.INSTALL_UNIQUE_LABEL, null); + ((EntityInternal)entity()).setAttribute(SoftwareProcess.INSTALL_DIR, (String)null); + entity().setConfig(SoftwareProcess.INSTALL_UNIQUE_LABEL, (String)null); entity().getConfigMap().addToLocalBag(parameters.getAllConfig()); entity().setAttribute(BrooklynNode.DOWNLOAD_URL, entity().getConfig(DOWNLOAD_URL));
