Improve SSH task

git-svn-id: https://svn.argeo.org/slc/trunk@3261 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

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 cc1ce57da5e1c2e7aa1ecfcdda758588111d9c7d..7054d384c35f073d8eb883dbbaab86816911f3ab 100644 (file)
--- 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 8afe5ec4aa77790ac80bed167dd6cf0a17484a68..241af88e9643358eac787cc463da5e252dacaf2e 100644 (file)
--- 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;