MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

ProcessWaiter: don't interrupt reading threads

Browse Source 
nobody checks for their interrupted status,
and we suspect it might cause freezes in IDEA-192097
This commit is contained in:
peter
2018-05-16 18:35:13 +02:00
parent 987368ccfd
commit 39c83243f8
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/openapi/vcs/impl/ProcessWaiter.java
+2 -10
View File
@@ -40,13 +40,11 @@ public abstract class ProcessWaiter<T extends CancellableRunnable> {
myInStreamListener = createStreamListener(worker.getInputStream());
final Application app = ApplicationManager.getApplication();
Future<?> errorStreamReadingFuture = null;
Future<?> outputStreamReadingFuture = null;
final int rc;
try {
errorStreamReadingFuture = app.executeOnPooledThread(myErrStreamListener);
outputStreamReadingFuture = app.executeOnPooledThread(myInStreamListener);
Future<?> errorStreamReadingFuture = app.executeOnPooledThread(myErrStreamListener);
Future<?> outputStreamReadingFuture = app.executeOnPooledThread(myInStreamListener);
rc = worker.execute();
if (tryReadStreams(rc)) {
errorStreamReadingFuture.get(timeout, TimeUnit.MILLISECONDS);
@@ -54,12 +52,6 @@ public abstract class ProcessWaiter<T extends CancellableRunnable> {
}
} finally {
cancelListeners();
if (errorStreamReadingFuture != null) {
errorStreamReadingFuture.cancel(true);
}
if (outputStreamReadingFuture != null) {
outputStreamReadingFuture.cancel(true);
}
}
return rc;