From bde180fb3f533f2368ad594ba595fe77ff8df853 Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Sat, 19 Feb 2011 13:07:02 +0100 Subject: [PATCH] switch off excessive logging --- .../javaCompiler/BackendCompilerWrapper.java | 4 -- .../javaCompiler/CompilerParsingThread.java | 44 +------------------ 2 files changed, 1 insertion(+), 47 deletions(-) diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/BackendCompilerWrapper.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/BackendCompilerWrapper.java index 9a25ec6014f8..181485b6b505 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/BackendCompilerWrapper.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/BackendCompilerWrapper.java @@ -377,10 +377,6 @@ public class BackendCompilerWrapper { exitValue = process.waitFor(); } catch (InterruptedException e) { - if (CompileDriver.ourDebugMode) { - System.out.println("Compiler interrupted; "); - e.printStackTrace(); - } process.destroy(); exitValue = process.exitValue(); } diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/CompilerParsingThread.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/CompilerParsingThread.java index dcb4d16d33d1..38b6b2f8e39d 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/CompilerParsingThread.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/CompilerParsingThread.java @@ -48,8 +48,6 @@ public class CompilerParsingThread implements Runnable, OutputParser.Callback { private volatile boolean myProcessExited = false; private final CompileContext myContext; - //private final BlockingQueue myLines = new LinkedBlockingQueue(); - public CompilerParsingThread(Process process, OutputParser outputParser, final boolean readErrorStream, boolean trimLines, CompileContext context) { myProcess = process; myOutputParser = outputParser; @@ -62,24 +60,6 @@ public class CompilerParsingThread implements Runnable, OutputParser.Callback { volatile boolean processing; public void run() { - //if (CompileDriver.ourDebugMode) { - // ApplicationManager.getApplication().executeOnPooledThread(new Runnable() { - // @Override - // public void run() { - // while (true) { - // final String line = readLine(myCompilerOutStreamReader); - // if (CompileDriver.ourDebugMode) { - // System.out.println("RAW_LIne read: #" + line + "#"); - // } - // if (line == null) { - // myLines.offer(TERMINATION_STRING); - // break; - // } - // myLines.offer(line); - // } - // } - // }); - //} processing = true; try { while (true) { @@ -131,7 +111,7 @@ public class CompilerParsingThread implements Runnable, OutputParser.Callback { myLastReadLine = pushBack; return pushBack; } - final String line = getNextUnprocessedLine(); + final String line = readLine(myCompilerOutStreamReader); if (LOG.isDebugEnabled()) { LOG.debug("LIne read: #" + line + "#"); } @@ -147,28 +127,6 @@ public class CompilerParsingThread implements Runnable, OutputParser.Callback { return myLastReadLine; } - private String getNextUnprocessedLine() { - //if (CompileDriver.ourDebugMode) { - // try { - // if (TERMINATION_STRING.equals(myLines.peek())) { - // return TERMINATION_STRING; - // } - // final String line = myLines.take(); - // if (TERMINATION_STRING.equals(line)) { - // myLines.offer(TERMINATION_STRING); // pushback - // } - // return line; - // } - // catch (InterruptedException e) { - // e.printStackTrace(); - // return TERMINATION_STRING; - // } - //} - //else { - return readLine(myCompilerOutStreamReader); - //} - } - @Override public void pushBack(String line) { myLastReadLine = null;