restore handling of ProjectBuildException

This commit is contained in:
Eugene Zhuravlev
2012-11-16 15:48:09 +01:00
parent e40dd530c4
commit ec0d2e8871
@@ -3,6 +3,7 @@ package org.jetbrains.jps.incremental;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.*;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.concurrency.BoundedTaskExecutor;
import com.intellij.util.containers.ConcurrentHashSet;
import com.intellij.util.containers.ContainerUtil;
@@ -171,13 +172,19 @@ public class IncProjectBuilder {
);
throw new RebuildRequestedException(cause);
}
else if (cause != null) {
myMessageDispatcher.processMessage(new CompilerMessage(BUILD_NAME, cause));
}
else {
String message = e.getMessage();
if (message == null) message = "Internal error";
myMessageDispatcher.processMessage(new CompilerMessage(BUILD_NAME, BuildMessage.Kind.ERROR, message));
if (cause == null) {
// some builder desided to stop the build
// report optional progress message if exists
final String msg = e.getMessage();
if (!StringUtil.isEmpty(msg)) {
myMessageDispatcher.processMessage(new ProgressMessage(msg));
}
}
else {
// the reason for the build stop is unexpected internal error, report it
myMessageDispatcher.processMessage(new CompilerMessage(BUILD_NAME, cause));
}
}
}
finally {