[tomcat] branch 10.0.x updated: Avoid null response

[markt]

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

markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.0.x by this push:
     new 1768355a1e Avoid null response
1768355a1e is described below

commit 1768355a1ef3fe77adf5c5900db5da9893d77926
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue May 10 14:17:06 2022 +0100

    Avoid null response
---
 java/org/apache/catalina/filters/CsrfPreventionFilter.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/filters/CsrfPreventionFilter.java 
b/java/org/apache/catalina/filters/CsrfPreventionFilter.java
index 6a54693856..f4f170b9e6 100644
--- a/java/org/apache/catalina/filters/CsrfPreventionFilter.java
+++ b/java/org/apache/catalina/filters/CsrfPreventionFilter.java
@@ -191,11 +191,9 @@ public class CsrfPreventionFilter extends 
CsrfPreventionFilterBase {
 
                 wResponse = new CsrfResponseWrapper(res, 
nonceRequestParameterName, newNonce);
             }
-        } else {
-            wResponse = response;
         }
 
-        chain.doFilter(request, wResponse);
+        chain.doFilter(request, wResponse == null ? response : wResponse);
     }
 
 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org