[jbossws-commits] JBossWS SVN: r17036 - in stack/cxf/tags/jbossws-cxf-3.1.2.SP13: modules/server/src/main/java/org/jboss/wsf/stack/cxf and 1 other directory.
Author: richard.opalka(a)jboss.com
Date: 2012-11-26 04:45:39 -0500 (Mon, 26 Nov 2012)
New Revision: 17036
Modified:
stack/cxf/tags/jbossws-cxf-3.1.2.SP13/
stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java
Log:
[JBPAPP-10410] fix endpoint instantiation concurrency issue
Property changes on: stack/cxf/tags/jbossws-cxf-3.1.2.SP13
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/cxf/trunk:12339
+ /stack/cxf/branches/jbossws-cxf-3.1.2:17027
/stack/cxf/trunk:12339
Modified:
stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java
===================================================================
---
stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2012-11-26
09:39:52 UTC (rev 17035)
+++
stack/cxf/tags/jbossws-cxf-3.1.2.SP13/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2012-11-26
09:45:39 UTC (rev 17036)
@@ -88,7 +88,8 @@
public abstract class AbstractInvoker implements Invoker
{
private static final Object[] NO_ARGS = new Object[]{};
-
+ private Object targetBean;
+
public Object invoke(Exchange exchange, Object o)
{
// set up the webservice request context
@@ -116,6 +117,15 @@
return new MessageContentsList(retObj);
}
+
+ private synchronized Object getTargetBean(Endpoint ep) throws Exception
+ {
+ if (targetBean == null)
+ {
+ targetBean = ep.getTargetBeanClass().newInstance();
+ }
+ return targetBean;
+ }
private Object _invokeInternal(Exchange exchange, Object o, WrappedMessageContext
ctx)
{
@@ -143,7 +153,7 @@
Invocation inv = invHandler.createInvocation();
InvocationContext invContext = inv.getInvocationContext();
- inv.getInvocationContext().addAttachment(WebServiceContext.class,
getWebServiceContext(ctx));
+ invContext.addAttachment(WebServiceContext.class, getWebServiceContext(ctx));
invContext.addAttachment(MessageContext.class, ctx);
inv.setJavaMethod(m);
inv.setArgs(params);
@@ -151,6 +161,7 @@
Object retObj = null;
try
{
+ invContext.setTargetBean(getTargetBean(ep)); //JBWS-2486 - JBWS-3002
invHandler.invoke(ep, inv);
retObj = inv.getReturnValue();
} catch (InvocationTargetException e) {