Author: ffang Date: Wed Jul 4 02:39:53 2012 New Revision: 1357044 URL: http://svn.apache.org/viewvc?rev=1357044&view=rev Log: Merged revisions 1355545 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
................ r1355545 | dkulp | 2012-06-30 04:09:16 +0800 (六, 30 6 2012) | 9 lines Merged revisions 1355502 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1355502 | dkulp | 2012-06-29 14:42:43 -0400 (Fri, 29 Jun 2012) | 2 lines Fix failing test ........ ................ Modified: cxf/branches/2.5.x-fixes/ (props changed) cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java?rev=1357044&r1=1357043&r2=1357044&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java (original) +++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java Wed Jul 4 02:39:53 2012 @@ -188,7 +188,7 @@ public class EndpointDefinitionParser ex for (BeanPostProcessor bpp : dlbf.getBeanPostProcessors()) { if (cls != null && cls.isInstance(bpp)) { impl.getServerFactory().setBlockPostConstruct(true); - impl.getServerFactory().setBlockInjection(true); + impl.getServerFactory().setBlockInjection(false); return; } if (bpp instanceof Jsr250BeanPostProcessor) {
