crafterm 2003/07/08 05:29:18
Modified: fortress/tools/src/java/org/apache/avalon/fortress/tools
Component.java
Log:
Fixed determination of component handler to use when
@fortress.handler has been specified, rather than
@x-avalon.lifestyle.
rev: bloritsch
Revision Changes Path
1.17 +8 -4
avalon/fortress/tools/src/java/org/apache/avalon/fortress/tools/Component.java
Index: Component.java
===================================================================
RCS file:
/home/cvs/avalon/fortress/tools/src/java/org/apache/avalon/fortress/tools/Component.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Component.java 18 Jun 2003 13:16:48 -0000 1.16
+++ Component.java 8 Jul 2003 12:29:18 -0000 1.17
@@ -243,13 +243,17 @@
}
}
- if ( null != avalonLifecycle )
+ if ( null != avalonLifecycle ) // lifecycle specified directly
{
lifecycle = stripQuotes( avalonLifecycle.getNamedParameter( ATTR_TYPE )
);
}
- else if ( handler != null )
+ else if ( null != fortressHandler ) // handler specified directly
{
- handler = ( null == fortressHandler ) ?
MetaInfoEntry.PER_THREAD_HANDLER : stripQuotes( fortressHandler.getNamedParameter(
ATTR_TYPE ) );
+ handler = stripQuotes( fortressHandler.getNamedParameter( ATTR_TYPE ) );
+ }
+ else // no lifecycle or handler specified, and no inspection match
+ {
+ handler = MetaInfoEntry.PER_THREAD_HANDLER;
}
if ( null != lifecycle ) setAttribute( TAG_LIFESTYLE, lifecycle );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
