mcconnell 2002/07/03 12:02:28
Modified: containerkit/src/java/org/apache/excalibur/containerkit/dependency
DependencyMap.java
Log:
Added != null test to catch cases where an optional dependency exists
and the dependecy has not been bound to a provider.
Revision Changes Path
1.6 +12 -4
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/dependency/DependencyMap.java
Index: DependencyMap.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/dependency/DependencyMap.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DependencyMap.java 3 Jul 2002 02:17:44 -0000 1.5
+++ DependencyMap.java 3 Jul 2002 19:02:28 -0000 1.6
@@ -228,9 +228,17 @@
{
final DependencyMetaData dependency =
component.getDependency( descriptors[ i ].getRole() );
- final ComponentMetaData other =
- getComponent( dependency.getProviderName() );
- visitcomponent( other, true, done, order );
+
+ // added != null clause to catch cases where an optional
+ // dependency exists and the dependecy has not been bound
+ // to a provider
+
+ if( dependency != null )
+ {
+ final ComponentMetaData other =
+ getComponent( dependency.getProviderName() );
+ visitcomponent( other, true, done, order );
+ }
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
