svn commit: r966002 - in /cxf/branches/2.2.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java

[sergeyb]

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;
     }