[jbossws-commits] JBossWS SVN: r10541 - framework/trunk/src/main/java/org/jboss/wsf/framework/deployment.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2009-08-16 19:00:58 -0400 (Sun, 16 Aug 2009)
New Revision: 10541

Modified:
   framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultService.java
   framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/VirtualHostDeploymentAspect.java
Log:
[JBWS-2320] svn merge -r 10476:10482 https://svn.jboss.org/repos/jbossws/framework/branches/ropalka

Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultService.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultService.java	2009-08-16 22:55:44 UTC (rev 10540)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultService.java	2009-08-16 23:00:58 UTC (rev 10541)
@@ -43,7 +43,7 @@
    private Deployment dep;
    private List<Endpoint> endpoints = new LinkedList<Endpoint>();
    private String contextRoot;
-   private String[] virtualHosts;
+   private List<String> virtualHosts;
 
    DefaultService()
    {
@@ -94,12 +94,22 @@
       this.contextRoot = contextRoot;
    }
 
-   public String[] getVirtualHosts()
+   public List<String> getVirtualHosts()
    {
-      return virtualHosts;
+      if ( virtualHosts != null )
+      {
+         final List<String> retVal = new LinkedList<String>();
+         for ( String virtualHost : virtualHosts )
+         {
+            retVal.add( virtualHost );
+         }
+         return retVal;
+      }
+      
+      return null;
    }
 
-   public void setVirtualHosts(String[] virtualHosts)
+   public void setVirtualHosts(List<String> virtualHosts)
    {
       this.virtualHosts = virtualHosts;      
    }      

Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/VirtualHostDeploymentAspect.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/VirtualHostDeploymentAspect.java	2009-08-16 22:55:44 UTC (rev 10540)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/VirtualHostDeploymentAspect.java	2009-08-16 23:00:58 UTC (rev 10541)
@@ -23,6 +23,7 @@
 package org.jboss.wsf.framework.deployment;
 
 import java.util.Arrays;
+import java.util.List;
 
 import org.jboss.wsf.spi.annotation.WebContext;
 import org.jboss.wsf.spi.deployment.Deployment;
@@ -44,15 +45,11 @@
    {
       if ( DeploymentType.JAXWS_EJB3.equals(dep.getType()))
       {
-         String[] virtualHosts = dep.getService().getVirtualHosts();
-         if (virtualHosts == null)
-         {
-            dep.getService().setVirtualHosts(getExplicitVirtualHosts(dep));
-         }
+         dep.getService().setVirtualHosts(getExplicitVirtualHosts(dep));
       }
    }
 
-   protected String[] getExplicitVirtualHosts(Deployment dep)
+   protected List<String> getExplicitVirtualHosts(Deployment dep)
    {
       String[] virtualHosts = null;
 
@@ -82,6 +79,14 @@
             }
          }
       }
-      return virtualHosts;
+      
+      if ( virtualHosts != null )
+      {
+         return Arrays.asList(virtualHosts);
+      }
+      else
+      {
+         return null;
+      }
    }
 }