brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aleds...@apache.org
Subject [3/7] incubator-brooklyn git commit: Fix SshMachineLocation pool’s displayName
Date Thu, 15 Jan 2015 10:12:01 GMT
Fix SshMachineLocation pool’s displayName


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/06731468
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/06731468
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/06731468

Branch: refs/heads/master
Commit: 0673146862730a07b6469981979b2bb2ea20c0b8
Parents: 6455a9d
Author: Aled Sage <aled.sage@gmail.com>
Authored: Thu Jan 8 21:09:07 2015 +0000
Committer: Aled Sage <aled.sage@gmail.com>
Committed: Wed Jan 14 22:38:08 2015 +0000

----------------------------------------------------------------------
 .../main/java/brooklyn/location/basic/SshMachineLocation.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/06731468/core/src/main/java/brooklyn/location/basic/SshMachineLocation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/location/basic/SshMachineLocation.java b/core/src/main/java/brooklyn/location/basic/SshMachineLocation.java
index 59a273e..c7b202a 100644
--- a/core/src/main/java/brooklyn/location/basic/SshMachineLocation.java
+++ b/core/src/main/java/brooklyn/location/basic/SshMachineLocation.java
@@ -304,10 +304,9 @@ public class SshMachineLocation extends AbstractLocation implements MachineLocat
 
     private BasicPool<SshTool> buildPool(final Map<String, ?> properties) {
         return BasicPool.<SshTool>builder()
-                .name(getDisplayName()+"@"+address+
+                .name(getDisplayName()+"@"+address+":"+getPort()+
                         (hasConfig(SSH_HOST, true) ? "("+getConfig(SSH_HOST)+":"+getConfig(SSH_PORT)+")"
: "")+
-                        ":"+
-                        System.identityHashCode(this))
+                        ":hash"+System.identityHashCode(this))
                 .supplier(new Supplier<SshTool>() {
                         @Override public SshTool get() {
                             return connectSsh(properties);


Mime
View raw message