mirror of
https://github.com/hierynomus/sshj.git
synced 2025-12-08 08:10:55 +03:00
AbstractChannel#close() should be no-op if already closed. Fixes #53.
This commit is contained in:
@@ -258,13 +258,15 @@ public abstract class AbstractChannel
|
|||||||
throws ConnectionException, TransportException {
|
throws ConnectionException, TransportException {
|
||||||
openCloseLock.lock();
|
openCloseLock.lock();
|
||||||
try {
|
try {
|
||||||
try {
|
if (isOpen()) {
|
||||||
sendClose();
|
try {
|
||||||
} catch (TransportException e) {
|
sendClose();
|
||||||
if (!closeEvent.inError())
|
} catch (TransportException e) {
|
||||||
throw e;
|
if (!closeEvent.inError())
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
closeEvent.await(conn.getTimeout(), TimeUnit.SECONDS);
|
||||||
}
|
}
|
||||||
closeEvent.await(conn.getTimeout(), TimeUnit.SECONDS);
|
|
||||||
} finally {
|
} finally {
|
||||||
openCloseLock.unlock();
|
openCloseLock.unlock();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user