svn commit: r1209034 - /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java

[is...@apache.org]

Author: isurues
Date: Thu Dec  1 11:14:59 2011
New Revision: 1209034

URL: http://svn.apache.org/viewvc?rev=1209034&view=rev
Log:
Removing unwanted methods after properly fixing AXIS2-4930

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=1209034&r1=1209033&r2=1209034&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 11:14:59 2011
@@ -83,11 +83,11 @@ public class JAXWSMessageReceiver implem
         // inside of the services.xml.
         AxisService service = axisRequestMsgCtx.getAxisService();
 
-        // we need to merge the deployment class loader to the TCCL. This is because, in JAX-WS
+        // we need to set the deployment class loader as the TCCL. This is because, in JAX-WS
         // services, there can be situations where we have to load classes from the deployment
         // artifact (JAX-WS jar file) in the message flow. Ex: Handler classes in the service
         // artifact. Adding this as a fix for AXIS2-4930.
-        mergeDeploymentCL(service);
+        setContextClassLoader(service.getClassLoader());
 
         org.apache.axis2.description.Parameter svcClassParam =
                 service.getParameter(PARAM_SERVICE_CLASS);
@@ -259,41 +259,6 @@ public class JAXWSMessageReceiver implem
     }
 
     /**
-     * Merges the deployment class loader to the TCCL. Deployment class loader is accessed through
-     * the AxisService and a new class loader is created by using URLs from deployment class loder
-     * and setting the current TCCL as the parent. Finally the new class loader is set as the TCCL.
-     *
-     * @param service - Current AxisService instance
-     */
-    private void mergeDeploymentCL(AxisService service) {
-        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()));
-//        }
-    }
-
-    /**
-     * Get context class loader of the current thread.
-     *
-     * @return ClassLoader
-     */
-    private ClassLoader getContextClassLoader() {
-        return (ClassLoader) AccessController.doPrivileged(
-                new PrivilegedAction() {
-                    public Object run() {
-                        return Thread.currentThread().getContextClassLoader();
-                    }
-                }
-        );
-    }
-
-    /**
      * Set context class loader of the current thread.
      *
      * @param cl the context ClassLoader for the Thread