From a82b3dacb88554d6f2049ff843fe3657bc5a2060 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Tue, 7 Feb 2012 12:52:38 +0400
Subject: [PATCH] handling abnormal termination of the compiler

---
 .../jetbrains/jet/plugin/compiler/JetCompiler.java   | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java
index b418dd7410d..4fb977aca57 100644
--- a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java
+++ b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java
@@ -147,14 +147,6 @@ public class JetCompiler implements TranslatingCompiler {
             processHandler.addProcessListener(new ProcessAdapter() {
                 StringBuilder stderr = null;
 
-                @Override
-                public void processTerminated(ProcessEvent event) {
-                    super.processTerminated(event);
-                    if(stderr != null) {
-                        compileContext.addMessage(ERROR, "stderr output:\r\n" + stderr.toString(), "", -1, -1);
-                    }
-                }
-
                 @Override
                 public void onTextAvailable(ProcessEvent event, Key outputType) {
                     String text = event.getText();
@@ -199,6 +191,10 @@ public class JetCompiler implements TranslatingCompiler {
                     if (event.getExitCode() != 0) {
                         compileContext.addMessage(ERROR, "Compiler terminated with exit code: " + event.getExitCode(), "", -1, -1);
                     }
+                    // By alex.tkachman:
+                    if(stderr != null) {
+                        compileContext.addMessage(ERROR, "stderr output:\r\n" + stderr.toString(), "", -1, -1);
+                    }
                 }
             });