You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2006/09/07 21:05:31 UTC
svn commit: r441176 - in /maven/continuum/trunk/continuum-core/src:
main/java/org/apache/maven/continuum/DefaultContinuum.java
test/java/org/apache/maven/continuum/DefaultContinuumUnitTest.java
Author: evenisse
Date: Thu Sep 7 12:05:30 2006
New Revision: 441176
URL: http://svn.apache.org/viewvc?view=rev&rev=441176
Log:
rollback rev.431371. ContinuumException is never thrown by actionManager and the test generate a NPE due to bad DefaultContinuum initialization
Removed:
maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumUnitTest.java
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=441176&r1=441175&r2=441176
==============================================================================
--- 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 Thu Sep 7 12:05:30 2006
@@ -170,16 +170,6 @@
} );
}
- public void setActionManager( ActionManager actionManager )
- {
- this.actionManager = actionManager;
- }
-
- public ActionManager getActionManager()
- {
- return actionManager;
- }
-
// ----------------------------------------------------------------------
// Project Groups
// ----------------------------------------------------------------------
@@ -2253,22 +2243,18 @@
// Workflow
// ----------------------------------------------------------------------
- protected void executeAction( String actionName, Map context )
+ private void executeAction( String actionName, Map context )
throws ContinuumException
{
try
{
- Action action = getActionManager().lookup( actionName );
+ Action action = actionManager.lookup( actionName );
action.execute( context );
}
catch ( ActionNotFoundException e )
{
throw new ContinuumException( "Error while executing the action '" + actionName + "'.", e );
- }
- catch ( ContinuumException e )
- {
- throw e;
}
catch ( Exception e )
{