donaldp 02/05/18 19:58:53
Modified: src/java/org/apache/avalon/phoenix/components/application
AppLifecycleHelper.java
src/java/org/apache/avalon/phoenix/components/lifecycle
LifecycleHelper.java
Log:
Pass in the name of component (used for logging purposes) to the
LifecycleHelper. This moves the name responsibility to caller rather than
retrieving it from entry.
Revision Changes Path
1.6 +11 -5
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AppLifecycleHelper.java 19 May 2002 02:54:36 -0000 1.5
+++ AppLifecycleHelper.java 19 May 2002 02:58:53 -0000 1.6
@@ -154,9 +154,13 @@
entry.setState( State.STARTING );
final Object block =
- m_lifecycleHelper.startup( entry, m_blockAccessor );
-
- m_exportHelper.exportBlock( m_context, entry.getMetaData(),
block );
+ m_lifecycleHelper.startup( entry.getName(),
+ entry,
+ m_blockAccessor );
+
+ m_exportHelper.exportBlock( m_context,
+ entry.getMetaData(),
+ block );
state = State.STARTED;
entry.setObject( block );
@@ -184,11 +188,13 @@
m_listenerSupport.fireBlockRemovedEvent( entry );
//Remove block from Management system
- m_exportHelper.unexportBlock( m_context, entry.getMetaData(),
entry.getObject() );
+ m_exportHelper.unexportBlock( m_context,
+ entry.getMetaData(),
+ entry.getObject() );
try
{
- m_lifecycleHelper.shutdown( entry );
+ m_lifecycleHelper.shutdown( entry.getName(), entry );
}
finally
{
1.6 +5 -5
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LifecycleHelper.java 19 May 2002 02:54:36 -0000 1.5
+++ LifecycleHelper.java 19 May 2002 02:58:53 -0000 1.6
@@ -65,16 +65,16 @@
* Errors that occur during shutdown will be logged appropriately and
* cause exceptions with useful messages to be raised.
*
+ * @param name the name o f the component
* @param entry the entry representing object
* @throws Exception if an error occurs when block passes
* through a specific lifecycle stage
*/
- public Object startup( final ComponentEntry entry,
+ public Object startup( final String name,
+ final ComponentEntry entry,
final ResourceAccessor accessor )
throws Exception
{
- final String name = entry.getName();
-
int stage = 0;
try
{
@@ -175,9 +175,9 @@
*
* @param entry the entry containing Block
*/
- public void shutdown( final ComponentEntry entry )
+ public void shutdown( final String name,
+ final ComponentEntry entry )
{
- final String name = entry.getName();
final Object object = entry.getObject();
entry.invalidate();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
