You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2012/11/20 10:10:48 UTC
svn commit: r1411598 - in /cxf/branches/2.6.x-fixes: ./ pom.xml
rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java
Author: ffang
Date: Tue Nov 20 09:10:48 2012
New Revision: 1411598
URL: http://svn.apache.org/viewvc?rev=1411598&view=rev
Log:
Merged revisions 1411309 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1411309 | dkulp | 2012-11-20 01:00:59 +0800 (二, 20 11 2012) | 1 line
[CXF-4640] If you reference the class directly anyway, you might as well just use that class object.
........
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/pom.xml
cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1411309
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.6.x-fixes/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/pom.xml?rev=1411598&r1=1411597&r2=1411598&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/pom.xml Tue Nov 20 09:10:48 2012
@@ -228,7 +228,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
+ <version>3.0</version>
<configuration>
<source>${cxf.jdk.version}</source>
<target>${cxf.jdk.version}</target>
@@ -538,7 +538,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
+ <version>3.0</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
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=1411598&r1=1411597&r2=1411598&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 Tue Nov 20 09:10:48 2012
@@ -176,17 +176,11 @@ public class EndpointDefinitionParser ex
}
public static final void setBlocking(ApplicationContext ctx, EndpointImpl impl) {
- Class<?> cls = null;
- try {
- cls = Class.forName(CommonAnnotationBeanPostProcessor.class.getName());
- } catch (ClassNotFoundException e) {
- //ignore
- }
AutowireCapableBeanFactory fact = ctx.getAutowireCapableBeanFactory();
if (fact instanceof DefaultListableBeanFactory) {
DefaultListableBeanFactory dlbf = (DefaultListableBeanFactory)fact;
for (BeanPostProcessor bpp : dlbf.getBeanPostProcessors()) {
- if (cls != null && cls.isInstance(bpp)) {
+ if (CommonAnnotationBeanPostProcessor.class.isInstance(bpp)) {
impl.getServerFactory().setBlockPostConstruct(true);
impl.getServerFactory().setBlockInjection(false);
return;