diff --git a/platform/platform-api/src/com/intellij/openapi/vcs/impl/ProcessWaiter.java b/platform/platform-api/src/com/intellij/openapi/vcs/impl/ProcessWaiter.java index 10cdf3d2a7f4..011f055eeb8c 100644 --- a/platform/platform-api/src/com/intellij/openapi/vcs/impl/ProcessWaiter.java +++ b/platform/platform-api/src/com/intellij/openapi/vcs/impl/ProcessWaiter.java @@ -40,13 +40,11 @@ public abstract class ProcessWaiter { 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 { } } finally { cancelListeners(); - if (errorStreamReadingFuture != null) { - errorStreamReadingFuture.cancel(true); - } - if (outputStreamReadingFuture != null) { - outputStreamReadingFuture.cancel(true); - } } return rc;