svn commit: r800618 - in /maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc: JavadocReport.java TestJavadocReport.java

[bentmann]

Author: bentmann
Date: Mon Aug  3 23:19:36 2009
New Revision: 800618

URL: http://svn.apache.org/viewvc?rev=800618&view=rev
Log:
[MJAVADOC-251] Configuration of javadoc:javadoc fails with NPE upon 
disadvantageous order of config injection

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

Modified: 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java?rev=800618&r1=800617&r2=800618&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
 (original)
+++ 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java
 Mon Aug  3 23:19:36 2009
@@ -237,7 +237,19 @@
      */
     public void setReportOutputDirectory( File reportOutputDirectory )
     {
-        if ( ( reportOutputDirectory != null ) && ( 
!reportOutputDirectory.getAbsolutePath().endsWith( destDir ) ) )
+        updateReportOutputDirectory( reportOutputDirectory, destDir );
+    }
+
+    public void setDestDir( String destDir )
+    {
+        this.destDir = destDir;
+        updateReportOutputDirectory( reportOutputDirectory, destDir );
+    }
+
+    private void updateReportOutputDirectory( File reportOutputDirectory, 
String destDir )
+    {
+        if ( reportOutputDirectory != null && destDir != null
+             && !reportOutputDirectory.getAbsolutePath().endsWith( destDir ) )
         {
             this.reportOutputDirectory = new File( reportOutputDirectory, 
destDir );
         }

Modified: 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocReport.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocReport.java?rev=800618&r1=800617&r2=800618&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocReport.java
 (original)
+++ 
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/TestJavadocReport.java
 Mon Aug  3 23:19:36 2009
@@ -195,7 +195,19 @@
      */
     public void setReportOutputDirectory( File reportOutputDirectory )
     {
-        if ( ( reportOutputDirectory != null ) && ( 
!reportOutputDirectory.getAbsolutePath().endsWith( destDir ) ) )
+        updateReportOutputDirectory( reportOutputDirectory, destDir );
+    }
+
+    public void setDestDir( String destDir )
+    {
+        this.destDir = destDir;
+        updateReportOutputDirectory( reportOutputDirectory, destDir );
+    }
+
+    private void updateReportOutputDirectory( File reportOutputDirectory, 
String destDir )
+    {
+        if ( reportOutputDirectory != null && destDir != null
+             && !reportOutputDirectory.getAbsolutePath().endsWith( destDir ) )
         {
             this.reportOutputDirectory = new File( reportOutputDirectory, 
destDir );
         }