From 69038ba6c09a4427ace5158fd434e27f1672d3f0 Mon Sep 17 00:00:00 2001 From: Rodrigo Quesada Date: Mon, 31 Aug 2015 03:03:48 -0600 Subject: [PATCH] KT-9003 FileNotFoundException when Kapt is unable to find corresponding annotations.txt #KT-9003 Fixed --- .../annotation/AnnotationProcessorWrapper.kt | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/libraries/tools/kotlin-annotation-processing/src/main/kotlin/org/jetbrains/kotlin/annotation/AnnotationProcessorWrapper.kt b/libraries/tools/kotlin-annotation-processing/src/main/kotlin/org/jetbrains/kotlin/annotation/AnnotationProcessorWrapper.kt index 4f38d40eb30..a8bbc07bc0a 100644 --- a/libraries/tools/kotlin-annotation-processing/src/main/kotlin/org/jetbrains/kotlin/annotation/AnnotationProcessorWrapper.kt +++ b/libraries/tools/kotlin-annotation-processing/src/main/kotlin/org/jetbrains/kotlin/annotation/AnnotationProcessorWrapper.kt @@ -81,16 +81,14 @@ public abstract class AnnotationProcessorWrapper( return } - val annotationsFile = processingEnv.getOptions().get(KAPT_ANNOTATION_OPTION) - if (annotationsFile != null) { - try { - kotlinAnnotationsProvider = FileKotlinAnnotationProvider(File(annotationsFile)) - } - catch (e: IOException) { - kotlinAnnotationsProvider = EmptyKotlinAnnotationsProvider() - } + val annotationsFilePath = processingEnv.getOptions().get(KAPT_ANNOTATION_OPTION) + val annotationsFile = if (annotationsFilePath != null) File(annotationsFilePath) else null + kotlinAnnotationsProvider = if (annotationsFile != null && annotationsFile.exists()) { + FileKotlinAnnotationProvider(annotationsFile) + } + else { + EmptyKotlinAnnotationsProvider() } - else kotlinAnnotationsProvider = EmptyKotlinAnnotationsProvider() processor.init(processingEnv) }