cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: Delaying injecting the contexts after the CXF features have been registered
Date Wed, 15 Feb 2017 22:11:12 GMT
Repository: cxf
Updated Branches:
  refs/heads/master a93cbfd99 -> 3fc02937b


Delaying injecting the contexts after the CXF features have been registered


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3fc02937
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3fc02937
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3fc02937

Branch: refs/heads/master
Commit: 3fc02937bd8ba0bb500a2cdfd8afa863b9cf6aec
Parents: a93cbfd
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Wed Feb 15 22:10:57 2017 +0000
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Wed Feb 15 22:10:57 2017 +0000

----------------------------------------------------------------------
 .../java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/3fc02937/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
index 8c753f0..123642f 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
@@ -180,7 +180,7 @@ public class JAXRSServerFactoryBean extends AbstractJAXRSFactoryBean {
             }
 
             ServerProviderFactory factory = setupFactory(ep);
-            injectContexts(factory);
+            
             ep.put(Application.class.getName(), appProvider);
             factory.setRequestPreprocessor(
                 new RequestPreprocessor(languageMappings, extensionMappings));
@@ -193,10 +193,13 @@ public class JAXRSServerFactoryBean extends AbstractJAXRSFactoryBean
{
             }
             checkPrivateEndpoint(ep);
 
-            factory.applyDynamicFeatures(getServiceFactory().getClassResourceInfo());
             applyBusFeatures(getBus());
             applyFeatures();
 
+            injectContexts(factory);
+            factory.applyDynamicFeatures(getServiceFactory().getClassResourceInfo());
+            
+            
             getServiceFactory().sendEvent(FactoryBeanListener.Event.SERVER_CREATED,
                                           server,
                                           null,


Mime
View raw message