[wicket] branch WICKET-6847-onEndRequest-before-flush updated: WICKET-6847: swap listeners and RequestCycle onEndRequest

[papegaaij]

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

papegaaij pushed a commit to branch WICKET-6847-onEndRequest-before-flush
in repository https://gitbox.apache.org/repos/asf/wicket.git


The following commit(s) were added to 
refs/heads/WICKET-6847-onEndRequest-before-flush by this push:
     new 2f49bc2  WICKET-6847: swap listeners and RequestCycle onEndRequest
2f49bc2 is described below

commit 2f49bc2826e855a0882efb1409b0ad2188c08661
Author: Emond Papegaaij <emond.papega...@topicus.nl>
AuthorDate: Wed Nov 11 16:21:19 2020 +0100

    WICKET-6847: swap listeners and RequestCycle onEndRequest
    
    This makes sure the session is destroyed (when needed) after the page
    store handles the touched pages. This latter action can create a new
    session if it was destroyed before, causing logout to fail.
---
 .../src/main/java/org/apache/wicket/request/cycle/RequestCycle.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java 
b/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
index 2c0a8c7..33d1335 100644
--- 
a/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
+++ 
b/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java
@@ -263,8 +263,8 @@ public class RequestCycle implements IRequestCycle, 
IEventSink, IMetadataContext
                {
                        try
                        {
-                               onEndRequest();
                                listeners.onEndRequest(this);
+                               onEndRequest();
                        }
                        catch (RuntimeException e)
                        {