donaldp 02/05/18 19:14:50
Modified: src/java/org/apache/avalon/phoenix/components/lifecycle
LifecycleHelper.java
Log:
Remove duplicate shutdown() method
Revision Changes Path
1.3 +1 -27
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/lifecycle/LifecycleHelper.java
Index: LifecycleHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/lifecycle/LifecycleHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LifecycleHelper.java 19 May 2002 02:09:05 -0000 1.2
+++ LifecycleHelper.java 19 May 2002 02:14:50 -0000 1.3
@@ -181,6 +181,7 @@
{
final String name = entry.getName();
final Object object = entry.getObject();
+ entry.invalidate();
//Stoppable stage
if( object instanceof Startable )
@@ -217,33 +218,6 @@
notice( name, STAGE_DESTROY );
entry.setState( State.DESTROYED );
- }
-
- /**
- * Method to run a <code>Block</code> through it's shutdown phase.
- * Errors that occur during shutdown will be logged appropraitely.
- *
- * @param entry the entry containing Block
- */
- public void shutdown( final ComponentEntry entry )
- {
- final Object block = entry.getObject();
-
- //Invalidate entry. This will invalidate
- //and null out Proxy object aswell as nulling out
- //block property
- entry.invalidate();
-
- //Stoppable stage
- try
- {
- ContainerUtil.shutdown( block );
- }
- finally
- {
- entry.setObject( null );
- entry.setState( State.DESTROYED );
- }
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
