[wicket] branch csp-configurable updated: WICKET-6727: do not unwrap HeaderItems before rendering

[papegaaij]

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

papegaaij pushed a commit to branch csp-configurable
in repository https://gitbox.apache.org/repos/asf/wicket.git


The following commit(s) were added to refs/heads/csp-configurable by this push:
     new c83d67b  WICKET-6727: do not unwrap HeaderItems before rendering
c83d67b is described below

commit c83d67be736a0d956918bf64518741e48abcfe46
Author: Emond Papegaaij <emond.papega...@topicus.nl>
AuthorDate: Thu Jan 23 11:01:24 2020 +0100

    WICKET-6727: do not unwrap HeaderItems before rendering
---
 .../org/apache/wicket/csp/CspNonceHeaderResponseDecorator.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git 
a/wicket-core/src/main/java/org/apache/wicket/csp/CspNonceHeaderResponseDecorator.java
 
b/wicket-core/src/main/java/org/apache/wicket/csp/CspNonceHeaderResponseDecorator.java
index 425c9db..bb0d6ee 100644
--- 
a/wicket-core/src/main/java/org/apache/wicket/csp/CspNonceHeaderResponseDecorator.java
+++ 
b/wicket-core/src/main/java/org/apache/wicket/csp/CspNonceHeaderResponseDecorator.java
@@ -43,14 +43,15 @@ public class CspNonceHeaderResponseDecorator extends 
DecoratingHeaderResponse
        {
                if (listener.isNonceEnabled())
                {
-                       while (item instanceof IWrappedHeaderItem)
+                       HeaderItem checkitem = item;
+                       while (checkitem instanceof IWrappedHeaderItem)
                        {
-                               item = ((IWrappedHeaderItem) item).getWrapped();
+                               checkitem = ((IWrappedHeaderItem) 
checkitem).getWrapped();
                        }
 
-                       if (item instanceof AbstractCspHeaderItem)
+                       if (checkitem instanceof AbstractCspHeaderItem)
                        {
-                               ((AbstractCspHeaderItem) 
item).setNonce(listener.getNonce(RequestCycle.get()));
+                               ((AbstractCspHeaderItem) 
checkitem).setNonce(listener.getNonce(RequestCycle.get()));
                        }
                }