[wicket] branch reiern70/WICKET-7067 updated (3cf61281ee -> 4999c6783c)

[re...@apache.org]

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

reiern70 pushed a change to branch reiern70/WICKET-7067
in repository https://gitbox.apache.org/repos/asf/wicket.git


    omit 3cf61281ee [WICKET-7067] WebSocketResponse does not allow setting a header thus, disableCaching fails with an UnsupportedOperationException
     new 4999c6783c [WICKET-7067] WebSocketResponse does not allow setting a header thus, disableCaching fails with an UnsupportedOperationException

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (3cf61281ee)
            \
             N -- N -- N   refs/heads/reiern70/WICKET-7067 (4999c6783c)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../java/org/apache/wicket/DefaultExceptionMapper.java     | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

[wicket] 01/01: [WICKET-7067] WebSocketResponse does not allow setting a header thus, disableCaching fails with an UnsupportedOperationException

[re...@apache.org]

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

reiern70 pushed a commit to branch reiern70/WICKET-7067
in repository https://gitbox.apache.org/repos/asf/wicket.git

commit 4999c6783c6638af7f82f04626e1c9d3a7284483
Author: reiern70 <re...@gmail.com>
AuthorDate: Thu Aug 17 11:58:20 2023 -0500

    [WICKET-7067] WebSocketResponse does not allow setting a header thus, disableCaching fails with an UnsupportedOperationException
---
 .../src/main/java/org/apache/wicket/DefaultExceptionMapper.java      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/wicket-core/src/main/java/org/apache/wicket/DefaultExceptionMapper.java b/wicket-core/src/main/java/org/apache/wicket/DefaultExceptionMapper.java
index a26a882c43..54346d587e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/DefaultExceptionMapper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/DefaultExceptionMapper.java
@@ -54,10 +54,11 @@ public class DefaultExceptionMapper implements IExceptionMapper
 		try
 		{
 			Response response = RequestCycle.get().getResponse();
-			if (response instanceof WebResponse)
+			// WICKET-7067 WebSocketResponse doesn't allow setting headers
+			if (response instanceof WebResponse && ((WebResponse) response).isHeaderSupported())
 			{
 				// we don't want to cache an exceptional reply in the browser
-				((WebResponse)response).disableCaching();
+				((WebResponse) response).disableCaching();
 			}
 			return internalMap(e);
 		}