/*
- * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ * Copyright (C) 2007-2012 Argeo GmbH
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.argeo.slc.jsch;
import java.io.IOException;
getSshTarget().getHost(), getSshTarget().getPort());
session.setUserInfo(getSshTarget().getUserInfo());
+ session.setServerAliveInterval(1000);
session.connect();
- if (log.isDebugEnabled())
- log.debug("Connected to " + getSshTarget() + " via SSH");
+ if (log.isTraceEnabled())
+ log.trace("Connected to " + getSshTarget() + " via SSH");
if (sshTarget.getSession() != null) {
- if (log.isDebugEnabled())
- log.debug("The cached session to " + getSshTarget()
+ if (log.isTraceEnabled())
+ log.trace("The cached session to " + getSshTarget()
+ " was disconnected and was reset.");
sshTarget.setSession(session);
}
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()
+ if (log.isTraceEnabled())
+ log.trace("Disconnected from " + getSshTarget()
+ " via SSH");
}
}