You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2002/06/18 07:21:04 UTC
cvs commit: jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application BlockEntry.java DefaultApplication.java State.java
donaldp 2002/06/17 22:21:04
Modified: src/java/org/apache/avalon/phoenix/components/application
BlockEntry.java DefaultApplication.java
Removed: src/java/org/apache/avalon/phoenix/components/application
State.java
Log:
Zap State object from BlockEntry (was never used anyways)
Revision Changes Path
1.16 +0 -12 jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockEntry.java
Index: BlockEntry.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockEntry.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- BlockEntry.java 19 May 2002 03:20:07 -0000 1.15
+++ BlockEntry.java 18 Jun 2002 05:21:04 -0000 1.16
@@ -19,7 +19,6 @@
class BlockEntry
{
private Object m_object;
- private State m_state;
private BlockMetaData m_blockMetaData;
private BlockInvocationHandler m_invocationHandler;
@@ -40,16 +39,6 @@
return m_blockMetaData;
}
- public final synchronized State getState()
- {
- return m_state;
- }
-
- public final synchronized void setState( final State state )
- {
- m_state = state;
- }
-
public synchronized Object getObject()
{
return m_object;
@@ -87,7 +76,6 @@
m_invocationHandler.invalidate();
m_invocationHandler = null;
}
- m_state = State.VOID;
m_object = null;
}
1.29 +12 -26 jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DefaultApplication.java
Index: DefaultApplication.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DefaultApplication.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- DefaultApplication.java 18 Jun 2002 03:51:44 -0000 1.28
+++ DefaultApplication.java 18 Jun 2002 05:21:04 -0000 1.29
@@ -26,9 +26,9 @@
import org.apache.avalon.phoenix.metadata.BlockListenerMetaData;
import org.apache.avalon.phoenix.metadata.BlockMetaData;
import org.apache.avalon.phoenix.metadata.SarMetaData;
-import org.apache.excalibur.threadcontext.ThreadContext;
-import org.apache.excalibur.containerkit.lifecycle.LifecycleHelper;
import org.apache.excalibur.containerkit.lifecycle.LifecycleException;
+import org.apache.excalibur.containerkit.lifecycle.LifecycleHelper;
+import org.apache.excalibur.threadcontext.ThreadContext;
/**
* This is the basic container of blocks. A server application
@@ -467,29 +467,18 @@
public void startup( final BlockEntry entry )
throws Exception
{
- State state = State.FAILED;
- try
- {
- entry.setState( State.CREATING );
-
- final Object block =
- m_lifecycleHelper.startup( entry.getName(),
- entry,
- m_blockAccessor );
+ final Object block =
+ m_lifecycleHelper.startup( entry.getName(),
+ entry,
+ m_blockAccessor );
+
+ m_exportHelper.exportBlock( m_context,
+ entry.getMetaData(),
+ block );
- m_exportHelper.exportBlock( m_context,
- entry.getMetaData(),
- block );
+ entry.setObject( block );
- state = State.CREATED;
- entry.setObject( block );
-
- m_listenerSupport.fireBlockAddedEvent( entry );
- }
- finally
- {
- entry.setState( state );
- }
+ m_listenerSupport.fireBlockAddedEvent( entry );
}
/**
@@ -504,8 +493,6 @@
public void shutdown( final BlockEntry entry )
throws LifecycleException
{
- entry.setState( State.DESTROYING );
-
m_listenerSupport.fireBlockRemovedEvent( entry );
final Object object = entry.getObject();
@@ -523,7 +510,6 @@
finally
{
entry.setObject( null );
- entry.setState( State.DESTROYED );
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>