Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 98038 invoked from network); 14 Aug 2007 13:03:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 Aug 2007 13:03:15 -0000 Received: (qmail 81454 invoked by uid 500); 14 Aug 2007 13:03:12 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 81404 invoked by uid 500); 14 Aug 2007 13:03:12 -0000 Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-commits@maven.apache.org Received: (qmail 81376 invoked by uid 99); 14 Aug 2007 13:03:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Aug 2007 06:03:12 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Aug 2007 13:03:13 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 44F751A981A; Tue, 14 Aug 2007 06:02:53 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r565732 - /maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Date: Tue, 14 Aug 2007 13:02:53 -0000 To: continuum-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070814130253.44F751A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: evenisse Date: Tue Aug 14 06:02:52 2007 New Revision: 565732 URL: http://svn.apache.org/viewvc?view=rev&rev=565732 Log: [CONTINUUM-1385] Fix JDO exception when deleting a project with build result attached to a project build definition Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?view=diff&rev=565732&r1=565731&r2=565732 ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Tue Aug 14 06:02:52 2007 @@ -540,9 +540,15 @@ { try { - Project project = store.getProject( projectId ); + Project project = store.getProjectWithBuilds( projectId ); getLogger().info( "Remove project " + project.getName() + "(" + projectId + ")" ); + + for ( Iterator i = project.getBuildResults().iterator(); i.hasNext(); ) + { + BuildResult br = (BuildResult) i.next(); + store.removeBuildResult( br ); + } File workingDirectory = getWorkingDirectory( projectId );