donaldp 2002/09/13 02:49:26
Modified: src/java/org/apache/avalon/phoenix/components/embeddor
DefaultEmbeddor.java
Log:
Allow kernel components to have a null role if they don't implement any interface.
Revision Changes Path
1.80 +23 -4
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor/DefaultEmbeddor.java
Index: DefaultEmbeddor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor/DefaultEmbeddor.java,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- DefaultEmbeddor.java 13 Sep 2002 09:31:34 -0000 1.79
+++ DefaultEmbeddor.java 13 Sep 2002 09:49:26 -0000 1.80
@@ -177,7 +177,7 @@
m_entries = new EmbeddorEntry[ children.length ];
for( int i = 0; i < children.length; i++ )
{
- final String role = children[ i ].getAttribute( "role" );
+ final String role = children[ i ].getAttribute( "role", null );
final String classname = children[ i ].getAttribute( "class" );
final String logger = children[ i ].getAttribute( "logger" );
m_entries[ i ] =
@@ -618,8 +618,13 @@
for( int i = 0; i < m_entries.length; i++ )
{
+ final String role = m_entries[ i ].getRole();
+ if( null == role )
+ {
+ continue;
+ }
final ManagementRegistration registration =
- ManagementRegistration.getManagementInfoForRole( m_entries[ i
].getRole() );
+ ManagementRegistration.getManagementInfoForRole( role );
if( null != registration )
{
componentManager.register( registration.getName(),
@@ -645,8 +650,13 @@
for( int i = 0; i < m_entries.length; i++ )
{
+ final String role = m_entries[ i ].getRole();
+ if( null == role )
+ {
+ continue;
+ }
final ManagementRegistration registration =
- ManagementRegistration.getManagementInfoForRole( m_entries[ i
].getRole() );
+ ManagementRegistration.getManagementInfoForRole( role );
if( null != registration )
{
componentManager.unregister( registration.getName() );
@@ -661,6 +671,10 @@
for( int i = 0; i < m_entries.length; i++ )
{
final String role = m_entries[ i ].getRole();
+ if( null == role )
+ {
+ continue;
+ }
final Object component = getEmbeddorComponent( role );
serviceManager.put( role, component );
}
@@ -692,7 +706,12 @@
for( int i = 0; i < m_entries.length; i++ )
{
final EmbeddorEntry entry = m_entries[ i ];
- if( entry.getRole().equals( role ) )
+ final String candidate = entry.getRole();
+ if( null == candidate )
+ {
+ continue;
+ }
+ if( candidate.equals( role ) )
{
return m_entries[ i ].getObject();
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
