[jboss-cvs] JBossAS SVN: r58090 - trunk/server/src/main/org/jboss/web/deployers

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

Author: thomas.diesler at jboss.com
Date: 2006-11-03 15:12:32 -0500 (Fri, 03 Nov 2006)
New Revision: 58090

Modified:
   trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java
Log:
setContextClassLoader in WebMetaData

Modified: trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java
===================================================================
--- trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java	2006-11-03 20:10:21 UTC (rev 58089)
+++ trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java	2006-11-03 20:12:32 UTC (rev 58090)
@@ -299,13 +299,12 @@
    {
       Thread thread = Thread.currentThread();
       ClassLoader appClassLoader = thread.getContextClassLoader();
-      WebApplication warInfo = null;
+      WebApplication webApp = null;
       try
       {
          // Create a classloader for the war to ensure a unique ENC
          URL[] empty = {};
-         URLClassLoader warLoader1 = URLClassLoader.newInstance(empty, di.getClassLoader());
-         URLClassLoader warLoader = warLoader1;
+         URLClassLoader warLoader = URLClassLoader.newInstance(empty, di.getClassLoader());
          thread.setContextClassLoader(warLoader);
          String webContext = metaData.getContextRoot();
    
@@ -358,15 +357,15 @@
          // Allow the policy to incorporate the policy configs
          Policy.getPolicy().refresh();
    
-         warInfo = new WebApplication(metaData);
-         warInfo.setClassLoader(warLoader);
-         performDeploy(warInfo, warURLString);
+         webApp = new WebApplication(metaData);
+         webApp.setClassLoader(warLoader);
+         performDeploy(webApp, warURLString);
       }
       finally
       {
          thread.setContextClassLoader(appClassLoader);
       }
-      return warInfo;
+      return webApp;
    }
 
    /**