Author: dkulp
Date: Fri Jun 29 20:09:16 2012
New Revision: 1355545
URL: http://svn.apache.org/viewvc?rev=1355545&view=rev
Log:
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.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java
Modified:
cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java?rev=1355545&r1=1355544&r2=1355545&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java
(original)
+++
cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java
Fri Jun 29 20:09:16 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) {
