Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9DE38E239 for ; Tue, 20 Nov 2012 09:11:14 +0000 (UTC) Received: (qmail 10412 invoked by uid 500); 20 Nov 2012 09:11:14 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 10264 invoked by uid 500); 20 Nov 2012 09:11:12 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 10221 invoked by uid 99); 20 Nov 2012 09:11:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Nov 2012 09:11:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Nov 2012 09:11:09 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 67CF323888CD; Tue, 20 Nov 2012 09:10:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: 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 Date: Tue, 20 Nov 2012 09:10:48 -0000 To: commits@cxf.apache.org From: ffang@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121120091049.67CF323888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ org.apache.maven.plugins maven-compiler-plugin - 2.5.1 + 3.0 ${cxf.jdk.version} ${cxf.jdk.version} @@ -538,7 +538,7 @@ org.apache.maven.plugins maven-compiler-plugin - 2.5.1 + 3.0 1.5 1.5 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;