[jbossws-commits] JBossWS SVN: r18163 - in stack/cxf/branches/jbossws-cxf-4.2.x/modules: server/src/main/java/org/jboss/wsf/stack/cxf/configuration and 1 other directory.
Author: rsearls
Date: 2013-12-10 16:24:30 -0500 (Tue, 10 Dec 2013)
New Revision: 18163
Modified:
stack/cxf/branches/jbossws-cxf-4.2.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java
stack/cxf/branches/jbossws-cxf-4.2.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java
Log:
BZ-1029762: added check that endpointConfig is set else throw exception.
Modified:
stack/cxf/branches/jbossws-cxf-4.2.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.2.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java 2013-12-10
16:52:54 UTC (rev 18162)
+++
stack/cxf/branches/jbossws-cxf-4.2.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/Messages.java 2013-12-10
21:24:30 UTC (rev 18163)
@@ -35,6 +35,7 @@
import org.jboss.logging.MessageBundle;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentType;
+import org.jboss.wsf.spi.deployment.WSFDeploymentException;
/**
* JBossWS-CXF exception messages
@@ -220,5 +221,8 @@
@Message(id = 24096, value = "Multiple incompatible JAXWS client Bus features
provided")
IllegalArgumentException incompatibleJAXWSClientBusFeatureProvided();
+
+ @Message(id = 24097, value = "Could not find endpoint config name: %s")
+ WSFDeploymentException couldNotFindEndpointConfigName(String name);
}
Modified:
stack/cxf/branches/jbossws-cxf-4.2.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java
===================================================================
---
stack/cxf/branches/jbossws-cxf-4.2.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2013-12-10
16:52:54 UTC (rev 18162)
+++
stack/cxf/branches/jbossws-cxf-4.2.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2013-12-10
21:24:30 UTC (rev 18163)
@@ -135,14 +135,20 @@
{
//use endpoint configs from AS domain
ServerConfig sc = AbstractServerConfig.getServerIntegrationServerConfig();
+ boolean isSetEndpointConfig = false;
for (org.jboss.wsf.spi.metadata.config.EndpointConfig config :
sc.getEndpointConfigs())
{
if (config.getConfigName().equals(configName))
{
endpoint.setEndpointConfig(config);
+ isSetEndpointConfig = true;
break;
}
}
+
+ if (!isSetEndpointConfig){
+ throw Messages.MESSAGES.couldNotFindEndpointConfigName(configName);
+ }
}
else
{