Introduce ssh file deployment

[gpl/argeo-slc.git] / runtime / org.argeo.slc.support.simple / src / main / java / org / argeo / slc / jsch / AbstractJschTask.java

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 9567d8f09b519f435b61c6f26cbccbf1c0a0175a..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
@@ -27,16 +27,27 @@ public abstract class AbstractJschTask implements Runnable {
                }
        }
 
-       protected void checkAck(InputStream in) throws IOException {
+       public final void run() {
+               Session session = openSession();
+               try {
+                       run(session);
+               } finally {
+                       session.disconnect();
+               }
+       }
+
+       abstract void run(Session session);
+
+       protected int checkAck(InputStream in) throws IOException {
                int b = in.read();
                // b may be 0 for success,
                // 1 for error,
                // 2 for fatal error,
                // -1
                if (b == 0)
-                       return;
+                       return b;
                else if (b == -1)
-                       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;
@@ -51,9 +62,12 @@ public abstract class AbstractJschTask implements Runnable {
                                throw new SlcException("SSH fatal error: " + sb.toString());
                        }
                }
+               return b;
        }
 
        public SshTarget getSshTarget() {
+               if (sshTarget == null)
+                       throw new SlcException("No SSH target defined.");
                return sshTarget;
        }