avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/loader/src/java/org/apache/excalibur/loader/builder LoaderBuilder.java
Date Fri, 01 Nov 2002 22:54:25 GMT
donaldp     2002/11/01 14:54:24

  Modified:    loader/src/java/org/apache/excalibur/loader/builder
                        LoaderBuilder.java
  Log:
  Fix bug where classloaders were always being built twice
  
  Revision  Changes    Path
  1.5       +1 -16     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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- LoaderBuilder.java	1 Nov 2002 21:45:44 -0000	1.4
  +++ LoaderBuilder.java	1 Nov 2002 22:54:24 -0000	1.5
  @@ -68,14 +68,7 @@
           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 );
  -            classLoaders.put( name, classLoader );
           }
       }
   
  @@ -96,15 +89,7 @@
           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 );
  -            classLoaders.put( name, classLoader );
           }
       }
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message