Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 40550 invoked from network); 3 Oct 2008 03:15:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Oct 2008 03:15:21 -0000 Received: (qmail 67051 invoked by uid 500); 3 Oct 2008 03:15:20 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 67027 invoked by uid 500); 3 Oct 2008 03:15:20 -0000 Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list commits@continuum.apache.org Received: (qmail 67016 invoked by uid 99); 3 Oct 2008 03:15:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Oct 2008 20:15:20 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Oct 2008 03:14:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 03A0523888AF; Thu, 2 Oct 2008 20:15:01 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r701289 - /continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java Date: Fri, 03 Oct 2008 03:15:00 -0000 To: commits@continuum.apache.org From: ctan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081003031501.03A0523888AF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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; }