Author: richard.opalka(a)jboss.com Date: 2011-10-12 10:04:53 -0400 (Wed, 12 Oct 2011) New Revision: 15089 Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java Log: final tuning fix - ensure proper injections Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2011-10-12 14:03:26 UTC (rev 15088) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2011-10-12 14:04:53 UTC (rev 15089) @@ -120,7 +120,8 @@ private static void injectServiceAndHandlerResources(Endpoint endpoint) { ServerFactoryBean factory = endpoint.getAttachment(ServerFactoryBean.class); - if (factory == null) throw new UnsupportedOperationException(); // TODO: move injection to ASIL + // ping endpoint to force injection + endpoint.getInstanceProvider().getInstance(endpoint.getTargetBeanName()); if (factory != null) { InjectionsMetaData metadata = endpoint.getAttachment(InjectionsMetaData.class); @@ -150,7 +151,8 @@ { if (isJaxwsJseEndpoint(endpoint) && factory.getServiceBean() != null) { - final Object epInstance = endpoint.getInstanceProvider().getInstance(factory.getServiceBean().getClass().getName()).getValue(); + final Reference epReference = endpoint.getInstanceProvider().getInstance(factory.getServiceBean().getClass().getName()); + final Object epInstance = epReference.getValue(); InjectionHelper.callPreDestroyMethod(epInstance); } }