Author: gnodet
Date: Thu Apr 29 13:48:55 2010
New Revision: 939307
URL: http://svn.apache.org/viewvc?rev=939307&view=rev
Log:
[sshd] include tomcat-apr in the distribution and avoid logging exceptions when
closing the auth forward support
Modified:
mina/sshd/trunk/assembly/pom.xml
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/agent/AgentForwardSupport.java
Modified: mina/sshd/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/mina/sshd/trunk/assembly/pom.xml?rev=939307&r1=939306&r2=939307&view=diff
==============================================================================
--- mina/sshd/trunk/assembly/pom.xml (original)
+++ mina/sshd/trunk/assembly/pom.xml Thu Apr 29 13:48:55 2010
@@ -62,6 +62,10 @@
<groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
</dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>tomcat-apr</artifactId>
+ </dependency>
</dependencies>
<build>
Modified:
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/agent/AgentForwardSupport.java
URL:
http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/agent/AgentForwardSupport.java?rev=939307&r1=939306&r2=939307&view=diff
==============================================================================
---
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/agent/AgentForwardSupport.java
(original)
+++
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/agent/AgentForwardSupport.java
Thu Apr 29 13:48:55 2010
@@ -28,6 +28,8 @@ import org.apache.tomcat.jni.Local;
import org.apache.tomcat.jni.Pool;
import org.apache.tomcat.jni.Socket;
import org.apache.tomcat.jni.Status;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.IOException;
@@ -36,6 +38,8 @@ import java.io.IOException;
*/
public class AgentForwardSupport {
+ private static final Logger log =
LoggerFactory.getLogger(AgentForwardSupport.class);
+
private final ServerSession session;
private String authSocket;
private long pool;
@@ -81,7 +85,9 @@ public class AgentForwardSupport {
throw new Exception(t);
}
} catch (Exception e) {
- e.printStackTrace();
+ if (!closed) {
+ log.info("Exchange caught in
authentication forwarding", e);
+ }
}
}
}