Author: thomas.diesler(a)jboss.com Date: 2008-01-09 16:14:02 -0500 (Wed, 09 Jan 2008) New Revision: 5443 Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java Log: Use InvocationType.JAXWS.MDB3 Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java =================================================================== --- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2008-01-09 21:11:00 UTC (rev 5442) +++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2008-01-09 21:14:02 UTC (rev 5443) @@ -30,6 +30,7 @@ import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.LifecycleHandler; import org.jboss.wsf.spi.deployment.LifecycleHandlerFactory; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.invocation.InvocationHandler; import org.jboss.wsf.spi.invocation.InvocationHandlerFactory; import org.jboss.wsf.spi.invocation.InvocationType; @@ -87,17 +88,23 @@ private InvocationHandler getInvocationHandler(Endpoint ep) { Deployment dep = ep.getService().getDeployment(); - String key = dep.getType().toString(); + DeploymentType depType = dep.getType(); + + String key = depType.toString(); // Use a special key for MDB endpoints EJBArchiveMetaData uapp = dep.getAttachment(EJBArchiveMetaData.class); if (uapp != null) { EJBMetaData bmd = uapp.getBeanByEjbName(ep.getShortName()); - if (bmd instanceof MDBMetaData) + if (depType == DeploymentType.JAXRPC_EJB21 && bmd instanceof MDBMetaData) { - key = "JAXRPC_MDB21"; + key = InvocationType.JAXRPC_MDB21.toString(); } + else if (depType == DeploymentType.JAXWS_EJB3 && bmd instanceof MDBMetaData) + { + key = InvocationType.JAXWS_MDB3.toString(); + } } InvocationType type = InvocationType.valueOf(key);