Repository: jclouds Updated Branches: refs/heads/1.7.x 64968e482 -> 9398373f9
JCLOUDS-561: Properly populate the ssh agent connection in the builder methods Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/9398373f Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/9398373f Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/9398373f Branch: refs/heads/1.7.x Commit: 9398373f94c1e31eb49ef056e07f877b85ce9854 Parents: 64968e4 Author: Ignasi Barrera <[email protected]> Authored: Wed May 7 14:58:50 2014 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Thu May 8 09:04:58 2014 +0200 ---------------------------------------------------------------------- .../jsch/src/main/java/org/jclouds/ssh/jsch/SessionConnection.java | 2 +- .../sshj/src/main/java/org/jclouds/sshj/SSHClientConnection.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/9398373f/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/SessionConnection.java ---------------------------------------------------------------------- diff --git a/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/SessionConnection.java b/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/SessionConnection.java index f6465cb..f15fc8f 100644 --- a/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/SessionConnection.java +++ b/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/SessionConnection.java @@ -124,7 +124,7 @@ public final class SessionConnection implements Connection<Session> { public Builder from(SessionConnection in) { return hostAndPort(in.hostAndPort).loginCredentials(in.loginCredentials).proxy(in.proxy.orNull()) - .connectTimeout(in.connectTimeout).sessionTimeout(in.sessionTimeout); + .connectTimeout(in.connectTimeout).sessionTimeout(in.sessionTimeout).agentConnector(in.agentConnector); } public Builder agentConnector(Optional<Connector> agentConnector) { http://git-wip-us.apache.org/repos/asf/jclouds/blob/9398373f/drivers/sshj/src/main/java/org/jclouds/sshj/SSHClientConnection.java ---------------------------------------------------------------------- diff --git a/drivers/sshj/src/main/java/org/jclouds/sshj/SSHClientConnection.java b/drivers/sshj/src/main/java/org/jclouds/sshj/SSHClientConnection.java index f1f32e2..1e7a42b 100644 --- a/drivers/sshj/src/main/java/org/jclouds/sshj/SSHClientConnection.java +++ b/drivers/sshj/src/main/java/org/jclouds/sshj/SSHClientConnection.java @@ -107,7 +107,7 @@ public class SSHClientConnection implements Connection<SSHClient> { protected Builder fromSSHClientConnection(SSHClientConnection in) { return hostAndPort(in.getHostAndPort()).connectTimeout(in.getConnectTimeout()).loginCredentials( - in.getLoginCredentials()); + in.getLoginCredentials()).sessionTimeout(in.getSessionTimeout()).agentConnector(in.getAgentConnector()); } }
