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

[rf...@apache.org]

Author: rfscholte
Date: Wed Nov 28 22:03:51 2012
New Revision: 1414956

URL: http://svn.apache.org/viewvc?rev=1414956&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.
javaHome can be either a directory or symbolic link, but must never be a file.

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=1414956&r1=1414955&r2=1414956&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 Wed Nov 28 22:03:51 2012
@@ -3521,7 +3521,7 @@ public abstract class AbstractJavadocMoj
             {
                 throw new IOException( "The environment variable JAVA_HOME is not correctly set." );
             }
-            if ( ( !new File( javaHome ).exists() ) || ( !new File( javaHome ).isDirectory() ) )
+            if ( ( !new File( javaHome ).exists() ) || ( new File( javaHome ).isFile() ) )
             {
                 throw new IOException(
                     "The environment variable JAVA_HOME=" + javaHome + " doesn't exist or is not a valid directory." );