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=2c4247f1a4b36abbfde25542a6a727f25d65b52d;hb=3581bc4795d047d7ad79270e249dd8f7e60c2cdf;hp=1fff474ee00ce1011935182a21eb07eee4cd356a;hpb=c9672b7c16ee662ff452fff8405a67cac091a15e;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 1fff474ee..2c4247f1a 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
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.argeo.slc.jsch;
 
 import java.io.IOException;
@@ -12,7 +28,7 @@ import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.Session;
 
 public abstract class AbstractJschTask implements Runnable {
-	private final static Log log = LogFactory.getLog(AbstractJschTask.class);
+	private final Log log = LogFactory.getLog(getClass());
 
 	private SshTarget sshTarget;
 
@@ -20,8 +36,8 @@ public abstract class AbstractJschTask implements Runnable {
 		if (sshTarget.getSession() != null) {
 			Session session = sshTarget.getSession();
 			if (session.isConnected()) {
-				if (log.isDebugEnabled())
-					log.debug("Using cached sesison to " + getSshTarget()
+				if (log.isTraceEnabled())
+					log.debug("Using cached session to " + getSshTarget()
 							+ " via SSH");
 				return session;
 			}
@@ -43,11 +59,13 @@ public abstract class AbstractJschTask implements Runnable {
 			if (sshTarget.getSession() != null) {
 				if (log.isDebugEnabled())
 					log.debug("The cached session to " + getSshTarget()
-							+ " was disconnected and was reste.");
+							+ " 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);
 		}