From 7d25396fa1d99dac71dd6e00a52afe671e3c392d Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Mon, 8 Oct 2012 17:23:52 +0200 Subject: [PATCH] do not log CompilationCanceledException --- jps/jps-builders/src/org/jetbrains/jps/javac/JavacMain.java | 3 +++ jps/jps-builders/src/org/jetbrains/jps/javac/JavacServer.java | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jps/jps-builders/src/org/jetbrains/jps/javac/JavacMain.java b/jps/jps-builders/src/org/jetbrains/jps/javac/JavacMain.java index 7c97446b602e..cf492dd138ea 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/javac/JavacMain.java +++ b/jps/jps-builders/src/org/jetbrains/jps/javac/JavacMain.java @@ -129,6 +129,9 @@ public class JavacMain { catch(IllegalArgumentException e) { outConsumer.report(new PlainMessageDiagnostic(Diagnostic.Kind.ERROR, e.getMessage())); } + catch (CompilationCanceledException ignored) { + outConsumer.report(new PlainMessageDiagnostic(Diagnostic.Kind.OTHER, "Compilation was canceled")); + } finally { fileManager.close(); } diff --git a/jps/jps-builders/src/org/jetbrains/jps/javac/JavacServer.java b/jps/jps-builders/src/org/jetbrains/jps/javac/JavacServer.java index 5fcb30bf786c..42fa33e83ceb 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/javac/JavacServer.java +++ b/jps/jps-builders/src/org/jetbrains/jps/javac/JavacServer.java @@ -137,9 +137,6 @@ public class JavacServer { final boolean rc = JavacMain.compile(options, files, classpath, platformCp, sourcePath, outs, diagnostic, outputSink, canceledStatus, false); return JavacProtoUtil.toMessage(sessionId, JavacProtoUtil.createBuildCompletedResponse(rc)); } - catch (CompilationCanceledException e) { - return JavacProtoUtil.toMessage(sessionId, JavacProtoUtil.createFailure(e.getMessage(), e)); - } catch (Throwable e) { e.printStackTrace(System.err); return JavacProtoUtil.toMessage(sessionId, JavacProtoUtil.createFailure(e.getMessage(), e));