This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-jakarta.git
The following commit(s) were added to refs/heads/master by this push:
new 6710172 TOMEE-3171 jaxrs.spec.context.client clientReaderTest
TOMEE-3172 jaxrs.spec.context.client clientWriterTest
6710172 is described below
commit 67101725ac768b1c0b1c0827409e8318255f7cae
Author: David Blevins <[email protected]>
AuthorDate: Fri Apr 30 02:38:10 2021 -0700
TOMEE-3171 jaxrs.spec.context.client clientReaderTest
TOMEE-3172 jaxrs.spec.context.client clientWriterTest
---
transform/src/patch/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/transform/src/patch/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
b/transform/src/patch/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
index 4cf99ff..7290eb6 100644
--- a/transform/src/patch/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
+++ b/transform/src/patch/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
@@ -1190,7 +1190,10 @@ public final class JAXRSUtils {
} else if (ResourceInfo.class.isAssignableFrom(clazz)) {
o = new ResourceInfoImpl(contextMessage);
} else if (ResourceContext.class.isAssignableFrom(clazz)) {
- o = new ResourceContextImpl(contextMessage,
contextMessage.getExchange().get(OperationResourceInfo.class));
+ OperationResourceInfo operationResourceInfo =
contextMessage.getExchange().get(OperationResourceInfo.class);
+ if (operationResourceInfo != null) {
+ o = new ResourceContextImpl(contextMessage,
operationResourceInfo);
+ }
} else if (Request.class.isAssignableFrom(clazz)) {
o = new RequestImpl(contextMessage);
} else if (Providers.class.isAssignableFrom(clazz)) {
