Skip to content

Commit d250780

Browse files
committed
Obey method contract
1 parent 8c19098 commit d250780

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -780,12 +780,16 @@ protected static void invokeMaven(
780780
InvocationRequest request = new DefaultInvocationRequest();
781781
request.setBaseDirectory(projectFile.getParentFile());
782782
request.setPomFile(projectFile);
783-
request.setGlobalSettingsFile(globalSettingsFile);
784-
if (userSettingsFile.isFile()) {
783+
if (globalSettingsFile != null && globalSettingsFile.isFile()) {
784+
request.setGlobalSettingsFile(globalSettingsFile);
785+
}
786+
if (userSettingsFile != null && userSettingsFile.isFile()) {
785787
request.setUserSettingsFile(userSettingsFile);
786788
}
787-
request.setGlobalToolchainsFile(globalToolchainsFile);
788-
if (userToolchainsFile.isFile()) {
789+
if (globalToolchainsFile != null && globalToolchainsFile.isFile()) {
790+
request.setGlobalToolchainsFile(globalToolchainsFile);
791+
}
792+
if (userToolchainsFile != null && userToolchainsFile.isFile()) {
789793
request.setToolchainsFile(userToolchainsFile);
790794
}
791795
request.setBatchMode(true);

0 commit comments

Comments
 (0)