You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2014/12/24 12:18:29 UTC

[2/3] incubator-brooklyn git commit: SshMachineLocation: include port in toString

SshMachineLocation: include port in toString

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

Branch: refs/heads/master
Commit: 8095ecbccfd5fa48e9ebd3a843331d694dd1a732
Parents: c0e49b2
Author: Aled Sage <al...@gmail.com>
Authored: Wed Dec 24 10:34:14 2014 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Dec 24 10:34:14 2014 +0000

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


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8095ecbc/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 03e53c6..59a273e 100644
--- a/core/src/main/java/brooklyn/location/basic/SshMachineLocation.java
+++ b/core/src/main/java/brooklyn/location/basic/SshMachineLocation.java
@@ -798,14 +798,14 @@ public class SshMachineLocation extends AbstractLocation implements MachineLocat
 
     @Override
     public String toString() {
-        return "SshMachineLocation["+getDisplayName()+":"+address+"@"+getId()+"]";
+        return "SshMachineLocation["+getDisplayName()+":"+address+":"+getPort()+"@"+getId()+"]";
     }
 
     @Override
     public String toVerboseString() {
         return Objects.toStringHelper(this).omitNullValues()
                 .add("id", getId()).add("name", getDisplayName())
-                .add("user", getUser()).add("address", getAddress()).add("port", getConfig(SSH_PORT))
+                .add("user", getUser()).add("address", getAddress()).add("port", getPort())
                 .add("parentLocation", getParent())
                 .toString();
     }