Index: DefaultDataSourceSelector.java
===================================================================
RCS file: /home/cvspublic/jakarta-avalon-cornerstone/src/java/org/apache/avalon/cornerstone/blocks/datasource/DefaultDataSourceSelector.java,v
retrieving revision 1.2
diff -u -r1.2 DefaultDataSourceSelector.java
--- DefaultDataSourceSelector.java	2001/06/02 14:39:11	1.2
+++ DefaultDataSourceSelector.java	2001/06/13 06:09:01
@@ -56,18 +56,18 @@
             final ClassLoader classLoader = 
                 Thread.currentThread().getContextClassLoader();
 
+            DataSourceComponent component = null;
             if( null == classLoader )
             {
                 Class.forName( driver );
+                component = (DataSourceComponent)Class.forName( clazz ).newInstance();
             }
             else
             {
                 classLoader.loadClass( driver );
+                component = (DataSourceComponent)classLoader.loadClass( clazz ).newInstance();
             }
 
-            
-            final DataSourceComponent component =
-                (DataSourceComponent)Class.forName( clazz ).newInstance();
             setupLogger( component, name );
             component.configure( dataSourceConf );
             m_dataSources.put( name, component );