donaldp 2002/11/08 19:19:00
Modified: fortress/src/java/org/apache/excalibur/fortress/container
AbstractContainer.java
Log:
Always dispose of handlers imediately. Do not try and queue it for later disposal as
this can lead to race conditions and errors - especially when queue shut down.
Revision Changes Path
1.4 +2 -24
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/container/AbstractContainer.java
Index: AbstractContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/container/AbstractContainer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractContainer.java 9 Nov 2002 03:12:08 -0000 1.3
+++ AbstractContainer.java 9 Nov 2002 03:19:00 -0000 1.4
@@ -497,29 +497,7 @@
while( i.hasNext() )
{
final ComponentHandler handler = (ComponentHandler)i.next();
- if( null != m_commandQueue )
- {
- try
- {
- m_commandQueue.enqueue(
- new DisposeComponentHandlerCommand( handler,
- getLogger() )
- );
-
- i.remove();
- }
- catch( final Exception e )
- {
- if( getLogger().isWarnEnabled() )
- {
- getLogger().warn( "Could not dispose component", e );
- }
- }
- }
- else
- {
- ContainerUtil.dispose( handler );
- }
+ ContainerUtil.dispose( handler );
}
}
--
To unsubscribe, e-mail: <mailto:avalon-cvs-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@;jakarta.apache.org>
