You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@continuum.apache.org by ct...@apache.org on 2008/10/03 05:15:00 UTC

svn commit: r701289 - /continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java

Author: ctan
Date: Thu Oct  2 20:15:00 2008
New Revision: 701289

URL: http://svn.apache.org/viewvc?rev=701289&view=rev
Log:
merge -r 701286:701287 from continuum-1.2.x branch
[CONTINUUM-1913]

Modified:
    continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java

Modified: continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java?rev=701289&r1=701288&r2=701289&view=diff
==============================================================================
--- continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java (original)
+++ continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java Thu Oct  2 20:15:00 2008
@@ -248,6 +248,11 @@
     {
         File releaseOutputDirectory = generalConfiguration.getReleaseOutputDirectory();
 
+        if ( releaseOutputDirectory == null )
+        {
+            releaseOutputDirectory = getFile( systemConf.getReleaseOutputDirectory() );
+            setReleaseOutputDirectory( releaseOutputDirectory );
+        }
         return releaseOutputDirectory;
     }