You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2018/07/11 14:15:17 UTC
[cxf] branch 3.2.x-fixes updated: CXF-7759 - Null pointer from the
ThreadLocalServletContext class
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.2.x-fixes by this push:
new 10093a9 CXF-7759 - Null pointer from the ThreadLocalServletContext class
10093a9 is described below
commit 10093a9546dd340f071d14d3d6730f9ebca9e4df
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Jul 11 14:28:35 2018 +0100
CXF-7759 - Null pointer from the ThreadLocalServletContext class
(cherry picked from commit 75435cbc19cc5dc75befce1d648a17327bae876d)
---
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
index ede0eb9..aa73e64 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
@@ -158,8 +158,9 @@ public class JAXRSInvoker extends AbstractInvoker {
final ClassResourceInfo cri = ori.getClassResourceInfo();
final Message inMessage = exchange.getInMessage();
final ServerProviderFactory providerFactory = ServerProviderFactory.getInstance(inMessage);
+ cri.injectContexts(resourceObject, ori, inMessage);
+
if (cri.isRoot()) {
- cri.injectContexts(resourceObject, ori, inMessage);
ProviderInfo<Application> appProvider = providerFactory.getApplicationProvider();
if (appProvider != null) {
InjectionUtils.injectContexts(appProvider.getProvider(),