donaldp 02/05/18 20:04:26
Modified: src/java/org/apache/avalon/phoenix/components/application
AppLifecycleHelper.java
src/java/org/apache/avalon/phoenix/components/lifecycle
LifecycleHelper.java
Log:
Make the entry passed into lifecycle helper an Object thus making it possible
to pass in container specific objects (that get forwarded to accessor) to run
component through lifecycle.
Revision Changes Path
1.7 +10 -6
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/AppLifecycleHelper.java
Index: AppLifecycleHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/AppLifecycleHelper.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AppLifecycleHelper.java 19 May 2002 02:58:53 -0000 1.6
+++ AppLifecycleHelper.java 19 May 2002 03:04:26 -0000 1.7
@@ -185,16 +185,20 @@
public void shutdown( final BlockEntry entry )
{
entry.setState( State.DESTROYING );
- m_listenerSupport.fireBlockRemovedEvent( entry );
- //Remove block from Management system
- m_exportHelper.unexportBlock( m_context,
- entry.getMetaData(),
- entry.getObject() );
+ m_listenerSupport.fireBlockRemovedEvent( entry );
+ final Object object = entry.getObject();
try
{
- m_lifecycleHelper.shutdown( entry.getName(), entry );
+ //Remove block from Management system
+ m_exportHelper.unexportBlock( m_context,
+ entry.getMetaData(),
+ object );
+ entry.invalidate();
+
+ m_lifecycleHelper.shutdown( entry.getName(),
+ object );
}
finally
{
1.7 +3 -8
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LifecycleHelper.java 19 May 2002 02:58:53 -0000 1.6
+++ LifecycleHelper.java 19 May 2002 03:04:26 -0000 1.7
@@ -27,8 +27,6 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.avalon.phoenix.components.lifecycle.ComponentEntry;
-import org.apache.avalon.phoenix.components.lifecycle.ResourceAccessor;
/**
* This is a class to help an Application manage lifecycle of
@@ -71,7 +69,7 @@
* through a specific lifecycle stage
*/
public Object startup( final String name,
- final ComponentEntry entry,
+ final Object entry,
final ResourceAccessor accessor )
throws Exception
{
@@ -173,14 +171,11 @@
* Avalon Lifecycle methods and updating State property of BlockEntry.
* Errors that occur during shutdown will be logged appropraitely.
*
- * @param entry the entry containing Block
+ * @param object the component to shutdown
*/
public void shutdown( final String name,
- final ComponentEntry entry )
+ final Object object )
{
- final Object object = entry.getObject();
- entry.invalidate();
-
//Stoppable stage
if( object instanceof Startable )
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
