Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 95330 invoked from network); 23 Sep 2008 03:39:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Sep 2008 03:39:36 -0000 Received: (qmail 50851 invoked by uid 500); 23 Sep 2008 03:39:33 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 50820 invoked by uid 500); 23 Sep 2008 03:39:33 -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 50809 invoked by uid 99); 23 Sep 2008 03:39:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Sep 2008 20:39:33 -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; Tue, 23 Sep 2008 03:38:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0E0BB238889D; Mon, 22 Sep 2008 20:38:45 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r698083 - in /continuum/trunk: continuum-commons/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Date: Tue, 23 Sep 2008 03:38:44 -0000 To: commits@continuum.apache.org From: ctan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080923033845.0E0BB238889D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ctan Date: Mon Sep 22 20:38:44 2008 New Revision: 698083 URL: http://svn.apache.org/viewvc?rev=698083&view=rev Log: [CONTINUUM-1886] fix NPE Modified: continuum/trunk/continuum-commons/src/main/java/org/apache/maven/continuum/configuration/DefaultConfigurationService.java continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.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=698083&r1=698082&r2=698083&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 Mon Sep 22 20:38:44 2008 @@ -247,16 +247,18 @@ public File getReleaseOutputDirectory() { File releaseOutputDirectory = generalConfiguration.getReleaseOutputDirectory(); - if ( releaseOutputDirectory == null ) - { - releaseOutputDirectory = getFile( systemConf.getReleaseOutputDirectory() ); - setReleaseOutputDirectory( releaseOutputDirectory ); - } + return releaseOutputDirectory; } public void setReleaseOutputDirectory( File releaseOutputDirectory ) { + if ( releaseOutputDirectory == null ) + { + generalConfiguration.setReleaseOutputDirectory( releaseOutputDirectory ); + return; + } + File f = releaseOutputDirectory; try { @@ -314,6 +316,11 @@ public File getReleaseOutputDirectory( int projectGroupId ) { + if ( getReleaseOutputDirectory() == null ) + { + return null; + } + File dir = new File( getReleaseOutputDirectory(), Integer.toString( projectGroupId ) ); try @@ -332,6 +339,11 @@ { File dir = getReleaseOutputDirectory( projectGroupId ); + if ( dir == null ) + { + return null; + } + if ( !dir.exists() && !dir.mkdirs() ) { throw new ConfigurationException( Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=698083&r1=698082&r2=698083&view=diff ============================================================================== --- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java (original) +++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Mon Sep 22 20:38:44 2008 @@ -802,16 +802,20 @@ Project project = getProjectWithBuilds( projectId ); List releaseResults = releaseResultDao.getContinuumReleaseResultsByProject( projectId ); - + try { for ( ContinuumReleaseResult releaseResult : releaseResults ) { releaseResultDao.removeContinuumReleaseResult( releaseResult ); } - + File releaseOutputDirectory = configurationService.getReleaseOutputDirectory( project.getProjectGroup().getId() ); - FileUtils.deleteDirectory( releaseOutputDirectory ); + + if ( releaseOutputDirectory != null ) + { + FileUtils.deleteDirectory( releaseOutputDirectory ); + } } catch ( ContinuumStoreException e ) {