You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by gn...@apache.org on 2009/11/20 11:46:23 UTC
svn commit: r882490 - in
/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd:
client/channel/ChannelSession.java common/channel/AbstractChannel.java
Author: gnodet
Date: Fri Nov 20 10:46:23 2009
New Revision: 882490
URL: http://svn.apache.org/viewvc?rev=882490&view=rev
Log:
Remove exception logging when closing a channel
Modified:
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/client/channel/ChannelSession.java
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/channel/AbstractChannel.java
Modified: mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/client/channel/ChannelSession.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/client/channel/ChannelSession.java?rev=882490&r1=882489&r2=882490&view=diff
==============================================================================
--- mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/client/channel/ChannelSession.java (original)
+++ mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/client/channel/ChannelSession.java Fri Nov 20 10:46:23 2009
@@ -89,8 +89,10 @@
}
}
} catch (Exception e) {
- log.info("Caught exception", e);
- close(false);
+ if (!closing) {
+ log.info("Caught exception", e);
+ close(false);
+ }
}
}
Modified: mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/channel/AbstractChannel.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/channel/AbstractChannel.java?rev=882490&r1=882489&r2=882490&view=diff
==============================================================================
--- mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/channel/AbstractChannel.java (original)
+++ mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/channel/AbstractChannel.java Fri Nov 20 10:46:23 2009
@@ -105,6 +105,7 @@
public void handleClose() throws IOException {
log.info("Received SSH_MSG_CHANNEL_CLOSE on channel {}", id);
synchronized (lock) {
+ closing = true;
doClose();
close(false).setClosed();
lock.notifyAll();