Merge pull request #10450 from geoand/dev-mojo-npe

Avoid very unlikely NPE
quarkusio · Jul 3, 2020 · 1351db3 · 1351db3
2 parents 8fbb04d + 5fea82b
commit 1351db3
Showing 1 changed file with 18 additions and 14 deletions.
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java
@@ -407,21 +407,25 @@ private void triggerCompile() throws MojoExecutionException {
      */
     private void handleResources() throws MojoExecutionException {
         List<Resource> resources = project.getResources();
-        if (!resources.isEmpty()) {
-            Plugin resourcesPlugin = project.getPlugin(ORG_APACHE_MAVEN_PLUGINS + ":" + MAVEN_RESOURCES_PLUGIN);
-            MojoExecutor.executeMojo(
-                    MojoExecutor.plugin(
-                            MojoExecutor.groupId(ORG_APACHE_MAVEN_PLUGINS),
-                            MojoExecutor.artifactId(MAVEN_RESOURCES_PLUGIN),
-                            MojoExecutor.version(resourcesPlugin.getVersion()),
-                            resourcesPlugin.getDependencies()),
-                    MojoExecutor.goal("resources"),
-                    getPluginConfig(resourcesPlugin),
-                    MojoExecutor.executionEnvironment(
-                            project,
-                            session,
-                            pluginManager));
+        if (resources.isEmpty()) {
+            return;
         }
+        Plugin resourcesPlugin = project.getPlugin(ORG_APACHE_MAVEN_PLUGINS + ":" + MAVEN_RESOURCES_PLUGIN);
+        if (resourcesPlugin == null) {
+            return;
+        }
+        MojoExecutor.executeMojo(
+                MojoExecutor.plugin(
+                        MojoExecutor.groupId(ORG_APACHE_MAVEN_PLUGINS),
+                        MojoExecutor.artifactId(MAVEN_RESOURCES_PLUGIN),
+                        MojoExecutor.version(resourcesPlugin.getVersion()),
+                        resourcesPlugin.getDependencies()),
+                MojoExecutor.goal("resources"),
+                getPluginConfig(resourcesPlugin),
+                MojoExecutor.executionEnvironment(
+                        project,
+                        session,
+                        pluginManager));
     }
 
     private void executeCompileGoal(Plugin plugin, String groupId, String artifactId) throws MojoExecutionException {