Author: richard.opalka(a)jboss.com Date: 2009-08-07 06:10:51 -0400 (Fri, 07 Aug 2009) New Revision: 10502 Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJSE.java Log: [JBWS-2662] sync with trunk before refactoring invocation layer Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJSE.java =================================================================== --- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJSE.java 2009-08-07 10:01:42 UTC (rev 10501) +++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJSE.java 2009-08-07 10:10:51 UTC (rev 10502) @@ -97,15 +97,20 @@ InvocationContext invContext = epInv.getInvocationContext(); WebServiceContext wsContext = invContext.getAttachment(WebServiceContext.class); + ResourceInjector injector = null; if (wsContext != null) { - ResourceInjector injector = resourceInjectorFactory.newResourceInjector(); + injector = resourceInjectorFactory.newResourceInjector(); injector.inject(targetBean, wsContext); } Method method = getImplMethod(targetBean.getClass(), epInv.getJavaMethod()); Object retObj = method.invoke(targetBean, epInv.getArgs()); epInv.setReturnValue(retObj); + if (wsContext != null) //JBWS-2662 + { + injector.inject(targetBean, null); + } } catch (Exception e) {