[cxf] branch 3.2.x-fixes updated: Prevent NPE when outMessage is null

[ilgrosso]

This is an automated email from the ASF dual-hosted git repository.

ilgrosso 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 ba400d9  Prevent NPE when outMessage is null
ba400d9 is described below

commit ba400d90f27659b52430e51f52f2dedbcce944c5
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Thu Apr 18 16:34:50 2019 +0200

    Prevent NPE when outMessage is null
---
 .../jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
index 0dfeec0..68aa78f 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
@@ -238,10 +238,10 @@ public final class ResponseImpl extends Response {
 
     public URI getLocation() {
         Object header = metadata.getFirst(HttpHeaders.LOCATION);
-        if (header == null) {
+        if (header == null && outMessage != null) {
             header = outMessage.get(Message.REQUEST_URI);
         }
-        return header == null || header instanceof URI ? (URI)header
+        return header == null || header instanceof URI ? (URI) header
             : URI.create(header.toString());
     }