[jboss-cvs] JBossAS SVN: r69209 - in trunk: tomcat/src/main/org/jboss/web/tomcat/service/deployers and 1 other directory.

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

Author: alesj
Date: 2008-01-22 13:26:25 -0500 (Tue, 22 Jan 2008)
New Revision: 69209

Modified:
   trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
Log:
Simple fixes.
Applying unused code in TomcatDeployment.

Modified: trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java	2008-01-22 17:03:01 UTC (rev 69208)
+++ trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java	2008-01-22 18:26:25 UTC (rev 69209)
@@ -358,8 +358,14 @@
             log.debug("Unpacking war to: " + expWarFile);
             VirtualFile root = unit.getRoot();
             InputStream is = root.openStream();
-            JarUtils.unjar(is, expWarFile);
-            is.close();
+            try
+            {
+               JarUtils.unjar(is, expWarFile);
+            }
+            finally
+            {
+               is.close();
+            }
             expWarUrl = expWarFile.toURL();
 
             // Map

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2008-01-22 17:03:01 UTC (rev 69208)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2008-01-22 18:26:25 UTC (rev 69209)
@@ -36,9 +36,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
-import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
-
 import javax.management.Attribute;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
@@ -577,7 +575,7 @@
             if (vfsurl.startsWith("vfs"))
                vfsURL = new URL(vfsurl.substring(3));
             classpath = new ArrayList<URL>();
-            classpath.add(classes.toURL());
+            classpath.add(vfsURL);
          }
          catch (Exception e)
          {