From 48fc7584c188d0e1f3b24d6f9fec47e8774257b7 Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Mon, 9 Dec 2019 14:37:02 +0200 Subject: [PATCH] Prevent possible NPE in KotlinCompilationProvider This could happen in Gradle because we don't yet have support for populating the relevant data --- .../quarkus/kotlin/deployment/KotlinCompilationProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/kotlin/deployment/src/main/java/io/quarkus/kotlin/deployment/KotlinCompilationProvider.java b/extensions/kotlin/deployment/src/main/java/io/quarkus/kotlin/deployment/KotlinCompilationProvider.java index da22bd142f158..b727268450aa6 100644 --- a/extensions/kotlin/deployment/src/main/java/io/quarkus/kotlin/deployment/KotlinCompilationProvider.java +++ b/extensions/kotlin/deployment/src/main/java/io/quarkus/kotlin/deployment/KotlinCompilationProvider.java @@ -37,10 +37,10 @@ public Set handledExtensions() { @Override public void compile(Set filesToCompile, Context context) { K2JVMCompilerArguments compilerArguments = new K2JVMCompilerArguments(); - if (!context.getCompilePluginArtifacts().isEmpty()) { + if (context.getCompilePluginArtifacts() != null && !context.getCompilePluginArtifacts().isEmpty()) { compilerArguments.setPluginClasspaths(context.getCompilePluginArtifacts().toArray(new String[0])); } - if (!context.getCompilerPluginOptions().isEmpty()) { + if (context.getCompilerPluginOptions() != null && !context.getCompilerPluginOptions().isEmpty()) { List sanitizedOptions = new ArrayList<>(context.getCompilerOptions().size()); for (String rawOption : context.getCompilerPluginOptions()) { Matcher matcher = OPTION_PATTERN.matcher(rawOption);