Obey method contract

apache · Aug 27, 2024 · d250780 · d250780
1 parent 8c19098
commit d250780
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
@@ -780,12 +780,16 @@ protected static void invokeMaven(
         InvocationRequest request = new DefaultInvocationRequest();
         request.setBaseDirectory(projectFile.getParentFile());
         request.setPomFile(projectFile);
-        request.setGlobalSettingsFile(globalSettingsFile);
-        if (userSettingsFile.isFile()) {
+        if (globalSettingsFile != null && globalSettingsFile.isFile()) {
+            request.setGlobalSettingsFile(globalSettingsFile);
+        }
+        if (userSettingsFile != null && userSettingsFile.isFile()) {
             request.setUserSettingsFile(userSettingsFile);
         }
-        request.setGlobalToolchainsFile(globalToolchainsFile);
-        if (userToolchainsFile.isFile()) {
+        if (globalToolchainsFile != null && globalToolchainsFile.isFile()) {
+            request.setGlobalToolchainsFile(globalToolchainsFile);
+        }
+        if (userToolchainsFile != null && userToolchainsFile.isFile()) {
             request.setToolchainsFile(userToolchainsFile);
         }
         request.setBatchMode(true);