Author: richard.opalka(a)jboss.com Date: 2009-03-19 12:19:02 -0400 (Thu, 19 Mar 2009) New Revision: 9633 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java Log: [JBWS-2486] fixing issue Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2009-03-19 16:14:35 UTC (rev 9632) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2009-03-19 16:19:02 UTC (rev 9633) @@ -224,6 +224,14 @@ Throwable targetEx = th.getTargetException(); throw (targetEx instanceof Exception ? (Exception)targetEx : new UndeclaredThrowableException(targetEx)); } + finally + { + // JBWS-2486 + if (endpoint.getAttachment(Object.class) == null) + { + endpoint.addAttachment(Object.class, inv.getInvocationContext().getTargetBean()); + } + } // Handler processing might have replaced the endpoint invocation sepInv = inv.getInvocationContext().getAttachment(EndpointInvocation.class); @@ -335,6 +343,8 @@ Invocation wsInv = new DelegatingInvocation(); wsInv.setInvocationContext(invContext); wsInv.setJavaMethod(getImplMethod(endpoint, epInv)); + // JBWS-2486, see endpoint attachment initialization above + wsInv.getInvocationContext().setTargetBean(endpoint.getAttachment(Object.class)); return wsInv; }