From 2fedf572f9a3515bd5e471240975308fc2e01c25 Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Fri, 26 Oct 2018 11:40:54 +0300 Subject: [PATCH] JPS: Don't catch BuildDataCorruptedException as internal error. BuildDataCorruptedException should be thrown up to `IncProjectBuilder` to be handled by TeamCity. #KT-27037 Fixed Original commit: cce125b98215354c35487318f0236da632e301d6 --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 795478e93ac..6270b13249c 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -23,6 +23,7 @@ import org.jetbrains.jps.builders.FileProcessor import org.jetbrains.jps.builders.impl.DirtyFilesHolderBase import org.jetbrains.jps.builders.java.JavaBuilderUtil import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor +import org.jetbrains.jps.builders.storage.BuildDataCorruptedException import org.jetbrains.jps.incremental.* import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.* import org.jetbrains.jps.incremental.java.JavaBuilder @@ -307,6 +308,9 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { } catch (e: StopBuildException) { LOG.info("Caught exception: $e") throw e + } catch (e: BuildDataCorruptedException) { + LOG.info("Caught exception: $e") + throw e } catch (e: Throwable) { LOG.info("Caught exception: $e") MessageCollectorUtil.reportException(messageCollector, e)