[jbossws-commits] JBossWS SVN: r18131 - in stack/cxf/branches/JBWS-3739/modules: server/src/main/java/org/jboss/wsf/stack/cxf/configuration and 1 other directory.
Author: asoldano
Date: 2013-12-04 09:56:33 -0500 (Wed, 04 Dec 2013)
New Revision: 18131
Modified:
stack/cxf/branches/JBWS-3739/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java
stack/cxf/branches/JBWS-3739/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java
Log:
[JBWS-3708] Update to latest spi
Modified:
stack/cxf/branches/JBWS-3739/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java
===================================================================
---
stack/cxf/branches/JBWS-3739/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java 2013-12-04
14:53:48 UTC (rev 18130)
+++
stack/cxf/branches/JBWS-3739/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java 2013-12-04
14:56:33 UTC (rev 18131)
@@ -589,12 +589,11 @@
if (jbossModulesEnv) { //optimization for avoiding checking for a server config
when we know for sure we're out-of-container
ServerConfig sc = getServerConfig();
if (sc != null) {
- for (ClientConfig config : sc.getClientConfigs()) {
- if (config.getConfigName().equals(ClientConfig.STANDARD_CLIENT_CONFIG))
{
- CXFClientConfigurer helper = new CXFClientConfigurer();
- helper.setupConfigHandlers(binding, config);
- helper.setConfigProperties(client, config.getProperties());
- }
+ ClientConfig config =
sc.getClientConfig(ClientConfig.STANDARD_CLIENT_CONFIG);
+ if (config != null) {
+ CXFClientConfigurer helper = new CXFClientConfigurer();
+ helper.setupConfigHandlers(binding, config);
+ helper.setConfigProperties(client, config.getProperties());
}
}
}
Modified:
stack/cxf/branches/JBWS-3739/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java
===================================================================
---
stack/cxf/branches/JBWS-3739/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2013-12-04
14:53:48 UTC (rev 18130)
+++
stack/cxf/branches/JBWS-3739/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2013-12-04
14:56:33 UTC (rev 18131)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -135,13 +135,9 @@
{
//use endpoint configs from AS domain
ServerConfig sc = AbstractServerConfig.getServerIntegrationServerConfig();
- for (org.jboss.wsf.spi.metadata.config.EndpointConfig config :
sc.getEndpointConfigs())
- {
- if (config.getConfigName().equals(configName))
- {
- endpoint.setEndpointConfig(config);
- break;
- }
+ org.jboss.wsf.spi.metadata.config.EndpointConfig config =
sc.getEndpointConfig(configName);
+ if (config != null) {
+ endpoint.setEndpointConfig(config);
}
}
else