donaldp 2002/11/07 16:10:57
Modified: fortress/src/java/org/apache/excalibur/fortress/handler
ThreadSafeComponentHandler.java
Log:
Factory can never be null and instance can never be non null - so don't bother
checking for it
Revision Changes Path
1.31 +5 -17
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/ThreadSafeComponentHandler.java
Index: ThreadSafeComponentHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/ThreadSafeComponentHandler.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ThreadSafeComponentHandler.java 8 Nov 2002 00:06:34 -0000 1.30
+++ ThreadSafeComponentHandler.java 8 Nov 2002 00:10:57 -0000 1.31
@@ -98,25 +98,13 @@
return;
}
- if( m_instance == null )
- {
- m_instance = m_factory.newInstance();
- }
+ m_instance = m_factory.newInstance();
if( m_logger.isDebugEnabled() )
{
- if( null != m_factory )
- {
- final String message = "ComponentHandler initialized for: " +
- m_factory.getCreatedClass().getName();
- m_logger.debug( message );
- }
- else
- {
- final String message =
- "ComponentHandler initialized for: " +
m_instance.getClass().getName();
- m_logger.debug( message );
- }
+ final String message = "ComponentHandler initialized for: " +
+ m_factory.getCreatedClass().getName();
+ m_logger.debug( message );
}
m_initialized = true;
--
To unsubscribe, e-mail: <mailto:avalon-cvs-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@;jakarta.apache.org>
