Author: richard.opalka(a)jboss.com Date: 2008-10-06 08:55:30 -0400 (Mon, 06 Oct 2008) New Revision: 8341 Modified: container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookEJB.java container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPostJSE.java container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPostJSE.java Log: [JBWS-2246][JBWS-2264][JBAS-5732] synchronize AS 5 CR2 integration layer with AS 5 trunk integration layer Modified: container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookEJB.java =================================================================== --- container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookEJB.java 2008-10-06 12:36:33 UTC (rev 8340) +++ container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookEJB.java 2008-10-06 12:55:30 UTC (rev 8341) @@ -24,6 +24,8 @@ import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.deployers.spi.DeploymentException; import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentState; + import static org.jboss.wsf.spi.deployment.Deployment.DeploymentState; /** @@ -41,7 +43,8 @@ super.deploy(unit); // Calls create Deployment dep = unit.getAttachment(Deployment.class); - if(null==dep || DeploymentState.CREATED != dep.getState()) + boolean expectedState = DeploymentState.CREATED == dep.getState() || DeploymentState.STARTED == dep.getState(); + if (null == dep || !expectedState) throw new DeploymentException("Create step failed"); // execute the 'start' step Modified: container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPostJSE.java =================================================================== --- container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPostJSE.java 2008-10-06 12:36:33 UTC (rev 8340) +++ container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPostJSE.java 2008-10-06 12:55:30 UTC (rev 8341) @@ -24,6 +24,7 @@ import org.jboss.deployers.spi.DeploymentException; import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentState; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; import static org.jboss.wsf.spi.deployment.Deployment.DeploymentState; @@ -47,7 +48,8 @@ if (!ignoreDeployment(unit) && isWebServiceDeployment(unit)) { Deployment dep = getDeployment(unit); - if(null==dep || DeploymentState.CREATED != dep.getState()) + boolean expectedState = DeploymentState.CREATED == dep.getState() || DeploymentState.STARTED == dep.getState(); + if (null == dep || !expectedState) throw new DeploymentException("Create step is missing"); // execute the 'start' step Modified: container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPostJSE.java =================================================================== --- container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPostJSE.java 2008-10-06 12:36:33 UTC (rev 8340) +++ container/jboss50/branches/jbossws-jboss500CR2-3.0.4.GA/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPostJSE.java 2008-10-06 12:55:30 UTC (rev 8341) @@ -44,7 +44,8 @@ if (!ignoreDeployment(unit) && isWebServiceDeployment(unit)) { Deployment dep = getDeployment(unit); - if (null == dep || DeploymentState.CREATED != dep.getState()) + boolean expectedState = DeploymentState.CREATED == dep.getState() || DeploymentState.STARTED == dep.getState(); + if (null == dep || !expectedState) throw new DeploymentException("Create step failed"); // execute the 'start' step