donaldp 2002/11/08 19:51:40
Modified: fortress/src/java/org/apache/excalibur/fortress/handler
AbstractComponentHandler.java
Log:
Change reference;
ComponentFactory implementation --> ObjectFactory interface.
Revision Changes Path
1.32 +8 -4
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/AbstractComponentHandler.java
Index: AbstractComponentHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/AbstractComponentHandler.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- AbstractComponentHandler.java 9 Nov 2002 03:46:39 -0000 1.31
+++ AbstractComponentHandler.java 9 Nov 2002 03:51:40 -0000 1.32
@@ -51,7 +51,6 @@
import org.apache.avalon.excalibur.logger.LoggerManager;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.context.Context;
@@ -61,6 +60,8 @@
import org.apache.excalibur.fortress.lifecycle.LifecycleExtensionManager;
import org.apache.excalibur.instrument.AbstractInstrumentable;
import org.apache.excalibur.instrument.InstrumentManager;
+import org.apache.excalibur.instrument.Instrumentable;
+import org.apache.excalibur.mpool.ObjectFactory;
/**
* AbstractComponentHandler class, ensures components are initialized
@@ -79,7 +80,7 @@
* The instance of the ComponentFactory that creates and disposes of the
* Component
*/
- protected final ComponentFactory m_factory;
+ protected final ObjectFactory m_factory;
/**
* State management boolean stating whether the Handler is initialized or
@@ -139,7 +140,10 @@
m_factory = new ComponentFactory( componentClass, config, service, context,
m_logkit,
extManager, instrumentManager );
m_extManager = extManager;
- addChildInstrumentable( m_factory );
+ if( m_factory instanceof Instrumentable )
+ {
+ addChildInstrumentable( (Instrumentable)m_factory );
+ }
m_context = context;
m_isLazy = isLazy.booleanValue();
}
--
To unsubscribe, e-mail: <mailto:avalon-cvs-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@;jakarta.apache.org>
