cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1411864 - /cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java
Date Tue, 20 Nov 2012 21:07:54 GMT
Author: dkulp
Date: Tue Nov 20 21:07:53 2012
New Revision: 1411864

URL: http://svn.apache.org/viewvc?rev=1411864&view=rev
Log:
Merged revisions 1411598 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1411598 | ffang | 2012-11-20 04:10:48 -0500 (Tue, 20 Nov 2012) | 9 lines

  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.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/EndpointDefinitionParser.java

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=1411864&r1=1411863&r2=1411864&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
Tue Nov 20 21:07:53 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;



Mime
View raw message