svn commit: r1436567 - /maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java

[rf...@apache.org]

Author: rfscholte
Date: Mon Jan 21 19:27:20 2013
New Revision: 1436567

URL: http://svn.apache.org/viewvc?rev=1436567&view=rev
Log:
Jenkins fails with following error: Unable to find javadoc command: The environment variable JAVA_HOME=f:\hudson\tools\java\latest-1.5-64 doesn't exist or is not a valid directory.
Check the canonicalFile

Modified:
    maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java

Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=1436567&r1=1436566&r2=1436567&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java Mon Jan 21 19:27:20 2013
@@ -3521,13 +3521,13 @@ public abstract class AbstractJavadocMoj
             {
                 throw new IOException( "The environment variable JAVA_HOME is not correctly set." );
             }
-            if ( ( !new File( javaHome ).exists() ) || ( new File( javaHome ).isFile() ) )
+            if ( ( !new File( javaHome ).getCanonicalFile().exists() ) || ( new File( javaHome ).getCanonicalFile().isFile() ) )
             {
                 throw new IOException(
                     "The environment variable JAVA_HOME=" + javaHome + " doesn't exist or is not a valid directory." );
             }
 
-            javadocExe = new File( env.getProperty( "JAVA_HOME" ) + File.separator + "bin", javadocCommand );
+            javadocExe = new File( javaHome + File.separator + "bin", javadocCommand );
         }
 
         if ( !javadocExe.getCanonicalFile().exists() || !javadocExe.getCanonicalFile().isFile() )