Author: dkulp Date: Tue Aug 2 17:08:06 2011 New Revision: 1153201 URL: http://svn.apache.org/viewvc?rev=1153201&view=rev Log: Merged revisions 1152196 via svnmerge from https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................ r1152196 | dkulp | 2011-07-29 09:02:38 -0400 (Fri, 29 Jul 2011) | 10 lines Merged revisions 1151918 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1151918 | dkulp | 2011-07-28 12:41:31 -0400 (Thu, 28 Jul 2011) | 2 lines Make sure the JaxWsProxyFactoryBean.create method is synchronized like the parent version is ........ ................ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java Propchange: cxf/branches/2.3.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java?rev=1153201&r1=1153200&r2=1153201&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java (original) +++ cxf/branches/2.3.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java Tue Aug 2 17:08:06 2011 @@ -129,7 +129,7 @@ public class JaxWsProxyFactoryBean exten * before making remote calls */ @Override - public Object create() { + public synchronized Object create() { Object obj = super.create(); Service service = getServiceFactory().getService(); if (needWrapperClassInterceptor(service.getServiceInfos().get(0))) {
