Fix SSH deadlock during OutOfMemoryError
In close() method of SshFetchConnection and SshPushConnection errorThread.join() can wait forever if JSch will not close the channel's error stream. Join with a timeout, and interrupt the copy thread if its blocked on data that will never arrive. Bug: 312863 Change-Id: I763081267653153eed9cd7763a015059338c2df8 Reported-by:Dmitry Neverov <dmitry.neverov@gmail.com> Signed-off-by:
Shawn O. Pearce <spearce@spearce.org>
Showing
- org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportGitSsh.java 4 additions, 4 deletions....jgit/src/org/eclipse/jgit/transport/TransportGitSsh.java
- org.eclipse.jgit/src/org/eclipse/jgit/util/io/StreamCopyThread.java 25 additions, 0 deletions...e.jgit/src/org/eclipse/jgit/util/io/StreamCopyThread.java
Loading
Please register or sign in to comment