Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 89717 invoked from network); 20 Jul 2010 20:52:27 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 20 Jul 2010 20:52:27 -0000 Received: (qmail 93750 invoked by uid 500); 20 Jul 2010 20:52:27 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 93693 invoked by uid 500); 20 Jul 2010 20:52:27 -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 93686 invoked by uid 99); 20 Jul 2010 20:52:27 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Jul 2010 20:52:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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 Jul 2010 20:52:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BE76223889EA; Tue, 20 Jul 2010 20:51:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r966002 - in /cxf/branches/2.2.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java Date: Tue, 20 Jul 2010 20:51:01 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100720205101.BE76223889EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Tue Jul 20 20:51:01 2010 New Revision: 966002 URL: http://svn.apache.org/viewvc?rev=966002&view=rev Log: Merged revisions 965966 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r965966 | dkulp | 2010-07-20 20:33:07 +0100 (Tue, 20 Jul 2010) | 1 line Apply feature before starting the server ........ Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ svn:mergeinfo = /cxf/trunk:965966 Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java?rev=966002&r1=966001&r2=966002&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java (original) +++ cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java Tue Jul 20 20:51:01 2010 @@ -109,6 +109,9 @@ public class JAXRSServerFactoryBean exte ep.put("org.apache.cxf.jaxrs.comparator", rc); } checkPrivateEndpoint(ep); + + applyFeatures(); + if (start) { server.start(); } @@ -122,7 +125,6 @@ public class JAXRSServerFactoryBean exte throw new ServiceConstructionException(e); } - applyFeatures(); return server; }