Mirrors/sshj
1
0
Fork 0
mirror of https://github.com/hierynomus/sshj.git synced 2025-12-07 07:40:55 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed race condition in global request response handling

Browse Source
This commit is contained in:
Jeroen van Erp
2016-03-18 11:17:09 +01:00
parent ca49ca324f
commit bd67135ffa
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/net/schmizz/sshj/connection/ConnectionImpl.java
View File

@@ -216,13 +216,15 @@ public class ConnectionImpl
throws ConnectionException {
synchronized (globalReqPromises) {
Promise<SSHPacket, ConnectionException> gr = globalReqPromises.poll();
if (gr == null)
if (gr == null) {
throw new ConnectionException(DisconnectReason.PROTOCOL_ERROR,
"Got a global request response when none was requested");
else if (response == null)
"Got a global request response when none was requested");
} else if (response == null) {
gr.deliverError(new ConnectionException("Global request [" + gr + "] failed"));
else
gr.deliver(response);
} else {
// To prevent a race condition, copy the packet before delivering, as it will be handled in a different thread.
gr.deliver(new SSHPacket(response));
}
}
}
@@ -278,4 +280,4 @@ public class ConnectionImpl
return keepAlive;
}
}
}