[jbossws-commits] JBossWS SVN: r10500 - in container/jboss50/branches: jbossws-jboss501/src/main/java/org/jboss/webservices/integration/invocation and 1 other directories.

Author: alessio.soldano(a)jboss.com Date: 2009-08-07 05:46:12 -0400 (Fri, 07 Aug 2009) New Revision: 10500 Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJSE.java container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJSE.java container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJSE.java Log: [JBWS-2662] Reducing memory usage cleaning ws context reference from the cached target bean, considering it will always be re-injected later Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJSE.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJSE.java 2009-08-07 08:35:19 UTC (rev 10499) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJSE.java 2009-08-07 09:46:12 UTC (rev 10500) @@ -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) { Modified: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJSE.java =================================================================== --- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJSE.java 2009-08-07 08:35:19 UTC (rev 10499) +++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJSE.java 2009-08-07 09:46:12 UTC (rev 10500) @@ -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) { Modified: container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJSE.java =================================================================== --- container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJSE.java 2009-08-07 08:35:19 UTC (rev 10499) +++ container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJSE.java 2009-08-07 09:46:12 UTC (rev 10500) @@ -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) {