[jboss-cvs] JBossAS SVN: r75842 - trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers.

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

Author: remy.maucherat at jboss.com
Date: 2008-07-15 10:12:20 -0400 (Tue, 15 Jul 2008)
New Revision: 75842

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
Log:
- Handle hosts in undeploy the same as in deploy.

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-07-15 13:00:52 UTC (rev 75841)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2008-07-15 14:12:20 UTC (rev 75842)
@@ -637,16 +637,24 @@
 
       JBossWebMetaData metaData = warInfo.getMetaData();
       String hostName = null;
-      List<String> hostNames = metaData.getVirtualHosts();
-      int length = hostNames != null ? hostNames.size() : 0;
-      if (hostNames != null && hostNames.size() > 0)
+      // Get any jboss-web/virtual-hosts
+      List<String> vhostNames = metaData.getVirtualHosts();
+      // Map the virtual hosts onto the configured hosts
+      Iterator hostNames = mapVirtualHosts(vhostNames);
+      if (hostNames.hasNext())
       {
-         hostName = hostNames.get(0);
+         hostName = hostNames.next().toString();
+      } else {
+    	 hostNames = getDefaultHosts();
+    	 if (hostNames.hasNext())
+         {
+            hostName = hostNames.next().toString();
+         }
       }
       performUndeployInternal(hostName, warUrl, warInfo);
-      for (int n = 1; n < length; n++)
+      while (hostNames.hasNext())
       {
-         String additionalHostName = hostNames.get(n);
+         String additionalHostName = hostNames.next().toString();
          performUndeployInternal(additionalHostName, warUrl, warInfo);
       }