You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2018/01/02 17:14:04 UTC
[maven-javadoc-plugin] 01/01: [MJAVADOC-504] NullPointerException
in JavadocUtil.getJavaHome() when JAVA_HOME isn't set
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MJAVADOC-504
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit 7505bb53d6d19b2726d50a77632164bf2b1fbf12
Author: rfscholte <rf...@apache.org>
AuthorDate: Tue Jan 2 18:13:54 2018 +0100
[MJAVADOC-504] NullPointerException in JavadocUtil.getJavaHome() when JAVA_HOME isn't set
---
.../java/org/apache/maven/plugins/javadoc/JavadocUtil.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 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
index 4dc7631..c2c640c 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
@@ -1280,7 +1280,6 @@ public class JavadocUtil
File javaHome = null;
// if maven.home is set, we can assume JAVA_HOME must be used for testing
-
if ( System.getProperty( "maven.home" ) == null )
{
// JEP220 (Java9) restructured the JRE/JDK runtime image
@@ -1299,7 +1298,14 @@ public class JavadocUtil
{
try
{
- javaHome = new File( CommandLineUtils.getSystemEnvVars().getProperty( "JAVA_HOME" ) );
+ String javaHomeValue = CommandLineUtils.getSystemEnvVars().getProperty( "JAVA_HOME" );
+
+ if ( javaHomeValue == null )
+ {
+ javaHomeValue = CommandLineUtils.getSystemEnvVars().getProperty( "java.home" );
+ }
+
+ javaHome = new File( javaHomeValue );
}
catch ( IOException e )
{
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.