[cxf] 01/02: Fix newRemoteAddr is never assigned

[deki]

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

deki pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit ae5bc3a7bc9b718c8b452e4f46e113709b6312da
Author: mo7ty <mo...@users.noreply.github.com>
AuthorDate: Sat Nov 10 01:12:32 2018 +0000

    Fix newRemoteAddr is never assigned
    
    * Using the wrong variable for not null validation before 
HttpServletRequestXForwardedFilter.newRemoteAddr assignment.
    
    (cherry picked from commit 82b24f6db4537623370ebfc7a229562253a16197)
    (cherry picked from commit 26c07f8e5212bff59f1dd21e5548f9003b248d23)
---
 .../main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
index cf9efdf..16da0dc 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
@@ -482,7 +482,7 @@ public abstract class AbstractHTTPServlet extends 
HttpServlet implements Filter
                                            String originalPort) {
             super(request);
             this.newProtocol = originalProto;
-            if (newRemoteAddr != null) {
+            if (originalRemoteAddr != null) {
                 newRemoteAddr = (originalRemoteAddr.split(",")[0]).trim();
             }
             newRequestUri = calculateNewRequestUri(request, originalPrefix);