From 05a8c7e57d6a2822d09fa1806955707c4cca368e Mon Sep 17 00:00:00 2001 From: Maxim Solodovnik Date: Tue, 26 Dec 2017 13:10:33 +0700 Subject: [PATCH] [WICKET-6512] feedbackMessages, style, pageId, sequence and temporarySessionAttributes are not being dropped while session replacement --- .../src/main/java/org/apache/wicket/Session.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wicket-core/src/main/java/org/apache/wicket/Session.java b/wicket-core/src/main/java/org/apache/wicket/Session.java index e7f9c144cdc..2c5616b67ca 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Session.java +++ b/wicket-core/src/main/java/org/apache/wicket/Session.java @@ -497,11 +497,6 @@ private void destroy() clientInfo = null; dirty = false; metaData = null; - feedbackMessages.clear(); - setStyle(null); - pageId.set(0); - sequence.set(0); - temporarySessionAttributes = null; } } @@ -515,6 +510,11 @@ public void invalidateNow() invalidate(); } destroy(); + feedbackMessages.clear(); + setStyle(null); + pageId.set(0); + sequence.set(0); + temporarySessionAttributes = null; } /**