Merge pull request quarkusio#6052 from geoand/kotlin-npe

Prevent possible NPE in KotlinCompilationProvider
stuartwdouglas · Dec 9, 2019 · d19be13 · d19be13
2 parents 9671e80 + 48fc758
commit d19be13
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...tlin/deployment/src/main/java/io/quarkus/kotlin/deployment/KotlinCompilationProvider.java b/...tlin/deployment/src/main/java/io/quarkus/kotlin/deployment/KotlinCompilationProvider.java
@@ -37,10 +37,10 @@ public Set<String> handledExtensions() {
     @Override
     public void compile(Set<File> 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<String> sanitizedOptions = new ArrayList<>(context.getCompilerOptions().size());
             for (String rawOption : context.getCompilerPluginOptions()) {
                 Matcher matcher = OPTION_PATTERN.matcher(rawOption);