bloritsch 2003/01/27 12:22:44
Modified: fortress/src/java/org/apache/avalon/fortress/impl
AbstractContainer.java
fortress/src/java/org/apache/excalibur/fortress/util
ContextManager.java
Log:
attempt to address runtime problem with refactoring
Revision Changes Path
1.2 +2 -2
jakarta-avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/AbstractContainer.java
Index: AbstractContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/AbstractContainer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractContainer.java 27 Jan 2003 16:55:41 -0000 1.1
+++ AbstractContainer.java 27 Jan 2003 20:22:43 -0000 1.2
@@ -327,7 +327,7 @@
// create the appropriate handler instance
final ComponentHandler targetHandler =
- (ComponentHandler)roleEntry.getHandlerClass().newInstance();
+ (ComponentHandler)handlerInstance;
// do the handler lifecycle
ContainerUtil.contextualize( targetHandler, m_context );
1.62 +14 -3
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextManager.java
Index: ContextManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextManager.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- ContextManager.java 24 Jan 2003 04:33:33 -0000 1.61
+++ ContextManager.java 27 Jan 2003 20:22:43 -0000 1.62
@@ -322,9 +322,20 @@
try
{
- if (getLogger().isDebugEnabled()) getLogger().debug("Shutting down:
" + o);
+ long start = 0;
+ if (getLogger().isDebugEnabled())
+ {
+ start = System.currentTimeMillis();
+ getLogger().debug("Shutting down: " + o);
+ }
+
ContainerUtil.shutdown( o );
- if (getLogger().isDebugEnabled()) getLogger().debug("Done.");
+
+ if (getLogger().isDebugEnabled())
+ {
+ long duration = System.currentTimeMillis() - start;
+ getLogger().debug("Done in " + duration + " ms");
+ }
}
catch( Exception e )
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
