Author: sagara
Date: Thu Dec  1 00:11:42 2011
New Revision: 1208901

URL: http://svn.apache.org/viewvc?rev=1208901&view=rev
Log:
Fixed AXIS2-4930 - Set Service CL as the context class loader to load JAX-WS 
handlers.

Modified:
    
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java

Modified: 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java?rev=1208901&r1=1208900&r2=1208901&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
 Thu Dec  1 00:11:42 2011
@@ -52,8 +52,6 @@ import org.apache.commons.logging.LogFac
 
 import javax.xml.ws.Binding;
 import javax.xml.ws.WebServiceException;
-import java.net.URL;
-import java.net.URLClassLoader;
 import java.security.PrivilegedAction;
 
 /**
@@ -268,14 +266,16 @@ public class JAXWSMessageReceiver implem
      * @param service - Current AxisService instance
      */
     private void mergeDeploymentCL(AxisService service) {
-        ClassLoader deploymentClassLoader = service.getClassLoader();
-        if (deploymentClassLoader instanceof URLClassLoader) {
-            // get URLs from deployment class loader
-            URL[] deploymentClassLoaderUrls = ((URLClassLoader) 
deploymentClassLoader).getURLs();
-            // create a new class loader by setting the current TCCL as the 
parent
-            setContextClassLoader(new URLClassLoader(deploymentClassLoaderUrls,
-                    getContextClassLoader()));
-        }
+        setContextClassLoader(service.getClassLoader());
+        //TODO - need to remove
+//        ClassLoader deploymentClassLoader = service.getClassLoader();
+//        if (deploymentClassLoader instanceof URLClassLoader) {
+//            // get URLs from deployment class loader
+//            URL[] deploymentClassLoaderUrls = ((URLClassLoader) 
deploymentClassLoader).getURLs();
+//            // create a new class loader by setting the current TCCL as the 
parent
+//            setContextClassLoader(new 
URLClassLoader(deploymentClassLoaderUrls,
+//                    getContextClassLoader()));
+//        }
     }
 
     /**


Reply via email to