From 63a0e9138108ea97610dcd95cf3e2571c7f2de24 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 9 Jan 2010 13:38:21 +0000 Subject: [PATCH] Improve SSH task git-svn-id: https://svn.argeo.org/slc/trunk@3261 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../src/main/java/org/argeo/slc/jsch/AbstractJschTask.java | 4 +++- .../src/main/java/org/argeo/slc/jsch/SshTarget.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/AbstractJschTask.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/AbstractJschTask.java index cc1ce57da..7054d384c 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/AbstractJschTask.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/AbstractJschTask.java @@ -47,7 +47,7 @@ public abstract class AbstractJschTask implements Runnable { if (b == 0) return b; else if (b == -1) - return b;//throw new SlcException("SSH ack returned -1"); + return b;// throw new SlcException("SSH ack returned -1"); else if (b == 1 || b == 2) { StringBuffer sb = new StringBuffer(); int c; @@ -66,6 +66,8 @@ public abstract class AbstractJschTask implements Runnable { } public SshTarget getSshTarget() { + if (sshTarget == null) + throw new SlcException("No SSH target defined."); return sshTarget; } diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/SshTarget.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/SshTarget.java index 8afe5ec4a..241af88e9 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/SshTarget.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/SshTarget.java @@ -4,7 +4,7 @@ import com.jcraft.jsch.UserInfo; public class SshTarget { private String host; - private Integer port; + private Integer port = 22; private String user; private UserInfo userInfo; -- 2.39.2