Author: cziegeler
Date: Fri Dec 31 07:12:45 2004
New Revision: 123798

URL: http://svn.apache.org/viewcvs?view=rev&rev=123798
Log:
Use thread class loader for now
Modified:
   
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ComponentFactory.java

Modified: 
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ComponentFactory.java
Url: 
http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ComponentFactory.java?view=diff&rev=123798&p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ComponentFactory.java&r1=123797&p2=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ComponentFactory.java&r2=123798
==============================================================================
--- 
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ComponentFactory.java
   (original)
+++ 
cocoon/trunk/src/core/java/org/apache/cocoon/core/container/ComponentFactory.java
   Fri Dec 31 07:12:45 2004
@@ -72,8 +72,14 @@
         this.environment.logger = actualLogger;
         
         // now get the meta data for the component
-        // FIXME - get the classloader from the environment
-        this.serviceClass = 
this.getClass().getClassLoader().loadClass(this.serviceInfo.getServiceClassName());
+        // FIXME - this is a workaround
+        if ( this.environment.classloader == null ) {
+            this.environment.classloader = 
Thread.currentThread().getContextClassLoader();
+            if ( this.environment.classloader == null ) {
+                this.environment.classloader = 
this.getClass().getClassLoader();
+            }            
+        }
+        this.serviceClass = 
this.environment.classloader.loadClass(this.serviceInfo.getServiceClassName());
         if ( this.serviceInfo.getDestroyMethodName() != null ) {
             this.destroyMethod = 
this.serviceClass.getMethod(this.serviceInfo.getDestroyMethodName(), null);
         } else {

Reply via email to