Repository: brooklyn-server Updated Branches: refs/heads/master 52852b696 -> 0947608d0
Flag allowing a Winrm4jTool to use unique context Fixes https://github.com/cloudsoft/winrm4j/issues/63 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/6437d9d5 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/6437d9d5 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/6437d9d5 Branch: refs/heads/master Commit: 6437d9d5f91fa8fafd31fb528947e64077857624 Parents: 15447e1 Author: Valentin Aitken <bos...@gmail.com> Authored: Mon May 15 20:23:38 2017 +0300 Committer: Valentin Aitken <bos...@gmail.com> Committed: Tue May 16 10:49:46 2017 +0300 ---------------------------------------------------------------------- .../internal/winrm/winrm4j/Winrm4jTool.java | 22 +------------------- 1 file changed, 1 insertion(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6437d9d5/software/winrm/src/main/java/org/apache/brooklyn/util/core/internal/winrm/winrm4j/Winrm4jTool.java ---------------------------------------------------------------------- diff --git a/software/winrm/src/main/java/org/apache/brooklyn/util/core/internal/winrm/winrm4j/Winrm4jTool.java b/software/winrm/src/main/java/org/apache/brooklyn/util/core/internal/winrm/winrm4j/Winrm4jTool.java index 970ae3d..2ea8318 100644 --- a/software/winrm/src/main/java/org/apache/brooklyn/util/core/internal/winrm/winrm4j/Winrm4jTool.java +++ b/software/winrm/src/main/java/org/apache/brooklyn/util/core/internal/winrm/winrm4j/Winrm4jTool.java @@ -59,7 +59,7 @@ import io.cloudsoft.winrm4j.winrm.WinRmToolResponse; public class Winrm4jTool implements org.apache.brooklyn.util.core.internal.winrm.WinRmTool, ManagementContextInjectable { private static final Logger LOG = LoggerFactory.getLogger(Winrm4jTool.class); - + private static final ConfigKey<WinRmClientContext> CONTEXT = ConfigKeys.newConfigKey(WinRmClientContext.class, "winrm.context"); // TODO Should we move this up to the interface? @@ -215,9 +215,7 @@ public class Winrm4jTool implements org.apache.brooklyn.util.core.internal.winrm } private io.cloudsoft.winrm4j.winrm.WinRmTool connect() { - WinRmClientContext context = createWinrmContext(mgmt); WinRmTool.Builder builder = WinRmTool.Builder.builder(host, computerName, user, password) - .context(context) .setAuthenticationScheme(authenticationScheme) .useHttps(useSecureWinrm) .port(port); @@ -233,24 +231,6 @@ public class Winrm4jTool implements org.apache.brooklyn.util.core.internal.winrm return builder.build(); } - private static synchronized WinRmClientContext createWinrmContext(ManagementContext mgmt) { - // TODO Use getScratchpad() - BrooklynProperties props = ((ManagementContextInternal)mgmt).getBrooklynProperties(); - WinRmClientContext instance = props.getConfig(CONTEXT); - if (instance == null) { - final WinRmClientContext newContext = WinRmClientContext.newInstance(); - instance = newContext; - props.put(CONTEXT, instance); - Threads.addShutdownHook(new Runnable() { - @Override - public void run() { - newContext.shutdown(); - } - }); - } - return instance; - } - private <T> T getRequiredConfig(ConfigBag bag, ConfigKey<T> key) { T result = bag.get(key); if (result == null) {
