Author: dkulp
Date: Wed Sep 11 18:06:44 2013
New Revision: 1521965

URL: http://svn.apache.org/r1521965
Log:
Merged revisions 1521956 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1521956 | dkulp | 2013-09-11 13:58:17 -0400 (Wed, 11 Sep 2013) | 2 lines

  [CXF-5271] JAXRS server should act like the JAXWS server

........

Modified:
    
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java

Modified: 
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java?rev=1521965&r1=1521964&r2=1521965&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
 Wed Sep 11 18:06:44 2013
@@ -182,15 +182,14 @@ public class JAXRSServerFactoryBean exte
             }
             checkPrivateEndpoint(ep);
             
+            
factory.applyDynamicFeatures(getServiceFactory().getClassResourceInfo());
+            applyFeatures();
+
             
getServiceFactory().sendEvent(FactoryBeanListener.Event.SERVER_CREATED,
                                           server, 
                                           null,
                                           null);
             
-            
factory.applyDynamicFeatures(getServiceFactory().getClassResourceInfo());
-            applyFeatures();
-            
-            
             
             if (start) {
                 try {


Reply via email to