[jboss-cvs] JBossAS SVN: r81166 - in projects/microcontainer/trunk/kernel/src/main/java/org/jboss: kernel/plugins/config and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2008-11-17 08:36:26 -0500 (Mon, 17 Nov 2008)
New Revision: 81166

Modified:
   projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/factory/GenericBeanFactory.java
   projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/config/Configurator.java
Log:
Make TCL usage as late as possible.

Modified: projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/factory/GenericBeanFactory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/factory/GenericBeanFactory.java	2008-11-17 12:13:39 UTC (rev 81165)
+++ projects/microcontainer/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/factory/GenericBeanFactory.java	2008-11-17 13:36:26 UTC (rev 81166)
@@ -37,8 +37,8 @@
 /**
  * Bean factory metadata.
  * 
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
  * @author <a href="ales.justin at jboss.com">Ales Justin</a>
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
  * @version $Revision$
  */
 public class GenericBeanFactory extends AbstractBeanFactory implements KernelControllerContextAware

Modified: projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/config/Configurator.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/config/Configurator.java	2008-11-17 12:13:39 UTC (rev 81165)
+++ projects/microcontainer/trunk/kernel/src/main/java/org/jboss/kernel/plugins/config/Configurator.java	2008-11-17 13:36:26 UTC (rev 81166)
@@ -51,6 +51,7 @@
  * Configuration utilities.
  *
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
  * @version $Revision$
  */
 public class Configurator extends Config
@@ -655,22 +656,30 @@
     */
    public static ClassLoader getClassLoader(ClassLoaderMetaData metaData) throws Throwable
    {
-      ClassLoader tcl = Thread.currentThread().getContextClassLoader();
+      ClassLoader tcl = null;
       ClassLoader cl = null;
+
       if (metaData != null)
       {
             ValueMetaData clVMD = metaData.getClassLoader();
             if (clVMD != null)
             {
+               tcl = Thread.currentThread().getContextClassLoader();
                Object object = clVMD.getValue(null, tcl);
                if (object != null && object instanceof ClassLoader == false)
                   throw new IllegalArgumentException("Configured object is not a classloader " + metaData);
                cl = (ClassLoader) object;
             }
       }
+
       if (cl == null)
-         cl = tcl;
-      return cl;
+      {
+         return (tcl != null) ? tcl : Thread.currentThread().getContextClassLoader();   
+      }
+      else
+      {
+         return cl;
+      }
    }
 
    /**