Return-Path: Delivered-To: apmail-maven-m2-dev-archive@www.apache.org Received: (qmail 6136 invoked from network); 28 Feb 2005 03:06:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 28 Feb 2005 03:06:09 -0000 Received: (qmail 60740 invoked by uid 500); 28 Feb 2005 03:06:09 -0000 Delivered-To: apmail-maven-m2-dev-archive@maven.apache.org Received: (qmail 60710 invoked by uid 500); 28 Feb 2005 03:06:08 -0000 Mailing-List: contact m2-dev-help@maven.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: "Maven 2 Developers List" Reply-To: "Maven 2 Developers List" Delivered-To: mailing list m2-dev@maven.apache.org Received: (qmail 60697 invoked by uid 500); 28 Feb 2005 03:06:08 -0000 Delivered-To: apmail-maven-components-cvs@apache.org Received: (qmail 60694 invoked by uid 99); 28 Feb 2005 03:06:08 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Sun, 27 Feb 2005 19:06:08 -0800 Received: (qmail 6116 invoked by uid 1717); 28 Feb 2005 03:06:07 -0000 Date: 28 Feb 2005 03:06:07 -0000 Message-ID: <20050228030607.6115.qmail@minotaur.apache.org> From: brett@apache.org To: maven-components-cvs@apache.org Subject: cvs commit: maven-components/maven-core/src/main/java/org/apache/maven/lifecycle DefaultLifecycleExecutor.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N brett 2005/02/27 19:06:07 Modified: maven-core/src/main/java/org/apache/maven/lifecycle DefaultLifecycleExecutor.java Log: Make sure loop is correctly aborted if there is a failure Revision Changes Path 1.10 +7 -6 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Index: DefaultLifecycleExecutor.java =================================================================== RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- DefaultLifecycleExecutor.java 27 Feb 2005 23:47:29 -0000 1.9 +++ DefaultLifecycleExecutor.java 28 Feb 2005 03:06:07 -0000 1.10 @@ -87,22 +87,23 @@ { String task = (String) i.next(); - PluginExecutionResponse pluginResponse; - if ( phaseMap.containsKey( task ) ) { executePhase( task, session, response ); } else { - pluginResponse = executeMojo( task, session ); + PluginExecutionResponse pluginResponse = executeMojo( task, session ); if ( pluginResponse.isExecutionFailure() ) { response.setExecutionFailure( task, pluginResponse.getFailureResponse() ); - break; } } + if ( response.isExecutionFailure() ) + { + break; + } } } catch ( Exception e ) @@ -224,7 +225,7 @@ if ( pluginResponse.isExecutionFailure() ) { response.setExecutionFailure( goal, pluginResponse.getFailureResponse() ); - break; + return; } } }