Add server capabilities to SLC RCP

[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 508a033e3d99f71758ad856b328a33f2ff29bb5d..0300232958dc043be8188f1346cbfe2b70b07a85 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
@@ -64,17 +64,19 @@ public abstract class AbstractJschTask implements Runnable {
                        }
                        return session;
                } catch (JSchException e) {
+                       if (sshTarget.getUserInfo() instanceof SimpleUserInfo)
+                               ((SimpleUserInfo) sshTarget.getUserInfo()).reset();
                        throw new SlcException("Could not open session to "
                                        + getSshTarget(), e);
                }
        }
 
-       public final void run() {
+       public void run() {
                Session session = openSession();
                try {
                        run(session);
                } finally {
-                       if (sshTarget.getSession() == null) {
+                       if (sshTarget != null && sshTarget.getSession() == null) {
                                session.disconnect();
                                if (log.isDebugEnabled())
                                        log.debug("Disconnected from " + getSshTarget()