X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.simple%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fjsch%2FAbstractJschTask.java;h=cc1ce57da5e1c2e7aa1ecfcdda758588111d9c7d;hb=20d41f48ae47404672f032cd44acf126636fd67b;hp=9567d8f09b519f435b61c6f26cbccbf1c0a0175a;hpb=e7ddf0b3a271a2f22108ee5b9fba69888f5c78ec;p=gpl%2Fargeo-slc.git 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 9567d8f09..cc1ce57da 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 @@ -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,6 +62,7 @@ public abstract class AbstractJschTask implements Runnable { throw new SlcException("SSH fatal error: " + sb.toString()); } } + return b; } public SshTarget getSshTarget() {