maven-m2-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject cvs commit: maven-components/maven-core/src/main/java/org/apache/maven/lifecycle DefaultLifecycleExecutor.java
Date Mon, 28 Feb 2005 03:06:07 GMT
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;
                       }
                   }
               }
  
  
  

Mime
View raw message