Author: gnodet
Date: Fri Sep 22 09:21:25 2006
New Revision: 448980

URL: http://svn.apache.org/viewvc?view=rev&rev=448980
Log:
Remove classloader stuff which is not needed anymore since it has moved to 
servicemix-common

Modified:
    
incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181Endpoint.java
    
incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181XBeanDeployer.java

Modified: 
incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181Endpoint.java
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181Endpoint.java?view=diff&rev=448980&r1=448979&r2=448980
==============================================================================
--- 
incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181Endpoint.java
 (original)
+++ 
incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181Endpoint.java
 Fri Sep 22 09:21:25 2006
@@ -41,7 +41,6 @@
 
 import org.apache.servicemix.common.Endpoint;
 import org.apache.servicemix.common.ExchangeProcessor;
-import org.apache.servicemix.common.xbean.XBeanServiceUnit;
 import org.apache.servicemix.jsr181.xfire.JbiFaultSerializer;
 import org.apache.servicemix.jsr181.xfire.ServiceFactoryHelper;
 import org.codehaus.xfire.XFire;
@@ -190,8 +189,7 @@
 
     public void registerService() throws Exception {
         if (pojo == null) {
-            ClassLoader classLoader = ((XBeanServiceUnit) 
getServiceUnit()).getConfigurationClassLoader();
-            Class cl = Class.forName(pojoClass, true, classLoader);
+            Class cl = Class.forName(pojoClass, true, 
getServiceUnit().getConfigurationClassLoader());
             pojo = cl.newInstance();
         }
         // Create factory

Modified: 
incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181XBeanDeployer.java
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181XBeanDeployer.java?view=diff&rev=448980&r1=448979&r2=448980
==============================================================================
--- 
incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181XBeanDeployer.java
 (original)
+++ 
incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181XBeanDeployer.java
 Fri Sep 22 09:21:25 2006
@@ -49,18 +49,10 @@
         if (ep.getPojo() == null && ep.getPojoClass() == null) {
             throw failure("deploy", "Endpoint must have a non-null pojo or a 
pojoClass", null);
         }
-        ClassLoader old = Thread.currentThread().getContextClassLoader();
         try {
-            ClassLoader cl = 
((XBeanServiceUnit)ep.getServiceUnit()).getConfigurationClassLoader();
-            Thread.currentThread().setContextClassLoader(cl);
-            if (logger.isDebugEnabled()) {
-                logger.debug("Registering endpoint with context classloader " 
+ cl);
-            }
             ep.registerService();
         } catch (Exception e) {
             throw failure("deploy", "Could not register endpoint", e);
-        } finally {
-            Thread.currentThread().setContextClassLoader(old);
         }
         return true;
     }


Reply via email to