donaldp 2002/11/01 13:45:44
Modified: loader/src/java/org/apache/excalibur/loader/builder
LoaderBuilder.java
Log:
Fix bug where classloaders could be created multiple times
Revision Changes Path
1.4 +10 -1
jakarta-avalon-excalibur/loader/src/java/org/apache/excalibur/loader/builder/LoaderBuilder.java
Index: LoaderBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/loader/src/java/org/apache/excalibur/loader/builder/LoaderBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LoaderBuilder.java 30 Oct 2002 23:47:01 -0000 1.3
+++ LoaderBuilder.java 1 Nov 2002 21:45:44 -0000 1.4
@@ -68,6 +68,10 @@
for( int i = 0; i < classLoaderDefs.length; i++ )
{
final String name = classLoaderDefs[ i ].getName();
+ if( classLoaders.containsKey( name ) )
+ {
+ continue;
+ }
processClassLoader( name, metaData, resolver, classLoaders );
final ClassLoader classLoader =
buildRegularClassLoader( classLoaderDefs[ i ], resolver,
classLoaders );
@@ -92,6 +96,11 @@
for( int i = 0; i < joins.length; i++ )
{
final String name = joins[ i ].getName();
+ if( classLoaders.containsKey( name ) )
+ {
+ return;
+ }
+
processClassLoader( name, metaData, resolver, classLoaders );
final ClassLoader classLoader =
buildJoinClassLoader( joins[ i ], resolver, classLoaders );
--
To unsubscribe, e-mail: <mailto:avalon-cvs-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@;jakarta.apache.org>
