Author: asoldano
Date: 2014-11-11 09:12:59 -0500 (Tue, 11 Nov 2014)
New Revision: 19095
Modified:
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/ClientConfigAdd.java
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/EndpointConfigAdd.java
Log:
[JBWS-3855] Fix regression
Modified:
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/ClientConfigAdd.java
===================================================================
---
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/ClientConfigAdd.java 2014-11-11
14:11:06 UTC (rev 19094)
+++
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/ClientConfigAdd.java 2014-11-11
14:12:59 UTC (rev 19095)
@@ -36,7 +36,6 @@
import org.jboss.as.webservices.util.ASHelper;
import org.jboss.as.webservices.util.WSServices;
import org.jboss.dmr.ModelNode;
-import org.jboss.msc.inject.Injector;
import org.jboss.msc.service.ServiceBuilder;
import org.jboss.msc.service.ServiceController;
import org.jboss.msc.service.ServiceName;
@@ -81,11 +80,14 @@
final ServiceTarget target = context.getServiceTarget();
final ServiceBuilder<?> clientServiceBuilder =
target.addService(serviceName, clientConfigService);
for (ServiceName sn : PackageUtils.getServiceNameDependencies(context,
serviceName, address, Constants.PROPERTY)) {
- clientServiceBuilder.addDependency(sn, PropertyService.class,
clientConfigService.getPropertiesInjector());
+ clientServiceBuilder.addDependency(sn, PropertyService.class,
clientConfigService.getPropertiesInjector()); //get a new injector instance each time
}
- setDependency(context, clientServiceBuilder,
clientConfigService.getPreHandlerChainsInjector(), UnifiedHandlerChainMetaData.class,
serviceName, address, Constants.PRE_HANDLER_CHAIN);
- final Injector<UnifiedHandlerChainMetaData> postInjector =
clientConfigService.getPostHandlerChainsInjector();
- setDependency(context, clientServiceBuilder, postInjector,
UnifiedHandlerChainMetaData.class, serviceName, address, Constants.POST_HANDLER_CHAIN);
+ for (ServiceName sn : PackageUtils.getServiceNameDependencies(context,
serviceName, address, Constants.PRE_HANDLER_CHAIN)) {
+ clientServiceBuilder.addDependency(sn, UnifiedHandlerChainMetaData.class,
clientConfigService.getPreHandlerChainsInjector()); //get a new injector instance each
time
+ }
+ for (ServiceName sn : PackageUtils.getServiceNameDependencies(context,
serviceName, address, Constants.POST_HANDLER_CHAIN)) {
+ clientServiceBuilder.addDependency(sn, UnifiedHandlerChainMetaData.class,
clientConfigService.getPostHandlerChainsInjector()); //get a new injector instance each
time
+ }
ServiceController<?> controller =
clientServiceBuilder.setInitialMode(ServiceController.Mode.ACTIVE).install();
if (newControllers != null) {
newControllers.add(controller);
@@ -94,11 +96,4 @@
context.reloadRequired();
}
}
-
- private <T> void setDependency(final OperationContext context, final
ServiceBuilder<?> builder, final Injector<T> injector,
- final Class<T> injectedClass, final ServiceName serviceName, final
PathAddress address, final String handlerChainType) {
- for (ServiceName sn : PackageUtils.getServiceNameDependencies(context,
serviceName, address, handlerChainType)) {
- builder.addDependency(sn, injectedClass, injector);
- }
- }
}
Modified:
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/EndpointConfigAdd.java
===================================================================
---
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/EndpointConfigAdd.java 2014-11-11
14:11:06 UTC (rev 19094)
+++
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/EndpointConfigAdd.java 2014-11-11
14:12:59 UTC (rev 19095)
@@ -36,7 +36,6 @@
import org.jboss.as.webservices.util.ASHelper;
import org.jboss.as.webservices.util.WSServices;
import org.jboss.dmr.ModelNode;
-import org.jboss.msc.inject.Injector;
import org.jboss.msc.service.ServiceBuilder;
import org.jboss.msc.service.ServiceController;
import org.jboss.msc.service.ServiceName;
@@ -83,13 +82,17 @@
final ConfigService endpointConfigService = new ConfigService(serverConfig,
name, false);
final ServiceTarget target = context.getServiceTarget();
- final ServiceBuilder<?> clientServiceBuilder =
target.addService(serviceName, endpointConfigService);
+ final ServiceBuilder<?> serviceBuilder = target.addService(serviceName,
endpointConfigService);
for (ServiceName sn : PackageUtils.getServiceNameDependencies(context,
serviceName, address, Constants.PROPERTY)) {
- clientServiceBuilder.addDependency(sn, PropertyService.class,
endpointConfigService.getPropertiesInjector());
+ serviceBuilder.addDependency(sn, PropertyService.class,
endpointConfigService.getPropertiesInjector()); //get a new injector instance each time
}
- setDependency(context, clientServiceBuilder,
endpointConfigService.getPreHandlerChainsInjector(), serviceName, address,
Constants.PRE_HANDLER_CHAIN);
- setDependency(context, clientServiceBuilder,
endpointConfigService.getPostHandlerChainsInjector(), serviceName, address,
Constants.POST_HANDLER_CHAIN);
- ServiceController<?> controller =
clientServiceBuilder.setInitialMode(ServiceController.Mode.ACTIVE).install();
+ for (ServiceName sn : PackageUtils.getServiceNameDependencies(context,
serviceName, address, Constants.PRE_HANDLER_CHAIN)) {
+ serviceBuilder.addDependency(sn, UnifiedHandlerChainMetaData.class,
endpointConfigService.getPreHandlerChainsInjector()); //get a new injector instance each
time
+ }
+ for (ServiceName sn : PackageUtils.getServiceNameDependencies(context,
serviceName, address, Constants.POST_HANDLER_CHAIN)) {
+ serviceBuilder.addDependency(sn, UnifiedHandlerChainMetaData.class,
endpointConfigService.getPostHandlerChainsInjector()); //get a new injector instance each
time
+ }
+ ServiceController<?> controller =
serviceBuilder.setInitialMode(ServiceController.Mode.ACTIVE).install();
if (newControllers != null) {
newControllers.add(controller);
}
@@ -97,11 +100,4 @@
context.reloadRequired();
}
}
-
- private void setDependency(final OperationContext context, final
ServiceBuilder<?> builder, final Injector<UnifiedHandlerChainMetaData>
injector,
- final ServiceName serviceName, final PathAddress address, final String
handlerChainType) {
- for (ServiceName sn : PackageUtils.getServiceNameDependencies(context,
serviceName, address, handlerChainType)) {
- builder.addDependency(sn, UnifiedHandlerChainMetaData.class, injector);
- }
- }
}