You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2020/11/03 16:48:47 UTC
[cxf] 11/16: Null checks
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit e83fb002e35e1dc8c5ef283470054c271e8c7aff
Author: Andy McCright <j....@gmail.com>
AuthorDate: Tue Oct 6 16:49:51 2020 -0500
Null checks
Signed-off-by: Andy McCright <j....@gmail.com>
(cherry picked from commit 1401f5b1a499ffa23053540f54158fa058af3239)
---
.../jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java | 2 +-
.../src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java
index bac4d2c..cdbb2f0 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java
@@ -97,7 +97,7 @@ public class JAXRSServiceImpl extends AbstractAttributedInterceptorProvider impl
if (serviceName != null) {
return serviceName;
}
- if (address == null) {
+ if (address == null && !classResourceInfos.isEmpty()) {
Class<?> primaryClass = classResourceInfos.get(0).getServiceClass();
String ns = PackageUtils.getNamespace(PackageUtils.getPackageName(primaryClass));
return new QName(ns, primaryClass.getSimpleName());
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java
index 4432d7e..f421ca7 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java
@@ -84,7 +84,7 @@ public class MessageContextImpl implements MessageContext {
throw new WebApplicationException(e, 413);
}
}
- if (keyValue.equals("WRITE-" + Message.ATTACHMENTS)) {
+ if (keyValue.equals("WRITE-" + Message.ATTACHMENTS) && m.getExchange().getOutMessage() != null) {
return m.getExchange().getOutMessage().get(Message.ATTACHMENTS);
}