Author: richard.opalka(a)jboss.com Date: 2011-10-12 09:34:20 -0400 (Wed, 12 Oct 2011) New Revision: 15082 Modified: common/trunk/src/main/java/org/jboss/ws/common/invocation/InvocationHandlerJAXWS.java Log: always inject WebServiceContext before post construct is called Modified: common/trunk/src/main/java/org/jboss/ws/common/invocation/InvocationHandlerJAXWS.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/invocation/InvocationHandlerJAXWS.java 2011-10-12 13:32:52 UTC (rev 15081) +++ common/trunk/src/main/java/org/jboss/ws/common/invocation/InvocationHandlerJAXWS.java 2011-10-12 13:34:20 UTC (rev 15082) @@ -65,6 +65,8 @@ final Reference reference = endpoint.getInstanceProvider().getInstance(_targetBean.getClass().getName()); final Object targetBean = reference.getValue(); + InjectionHelper.injectWebServiceContext(targetBean, ThreadLocalAwareWebServiceContext.getInstance()); + if (!reference.isInitialized()) { this.log.debug("Injecting resources on JAXWS JSE endpoint: " + targetBean); @@ -75,8 +77,6 @@ reference.setInitialized(); } - InjectionHelper.injectWebServiceContext(targetBean, ThreadLocalAwareWebServiceContext.getInstance()); - endpoint.addAttachment(PreDestroyHolder.class, new PreDestroyHolder(targetBean)); }