[wicket] branch master updated: WICKET-6702: swap serialization and async to prevent unlocked access to pages

[papegaaij]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new d86a288  WICKET-6702: swap serialization and async to prevent unlocked 
access to pages
d86a288 is described below

commit d86a288a774e980771cdf0512479b22dad1a3328
Author: Emond Papegaaij <emond.papega...@topicus.nl>
AuthorDate: Tue Sep 15 15:05:12 2020 +0200

    WICKET-6702: swap serialization and async to prevent unlocked access to 
pages
---
 .../src/main/java/org/apache/wicket/DefaultPageManagerProvider.java | 4 ++--
 .../test/java/org/apache/wicket/DefaultPageManagerProviderTest.java | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/wicket-core/src/main/java/org/apache/wicket/DefaultPageManagerProvider.java 
b/wicket-core/src/main/java/org/apache/wicket/DefaultPageManagerProvider.java
index 4d65267..c3d9064 100644
--- 
a/wicket-core/src/main/java/org/apache/wicket/DefaultPageManagerProvider.java
+++ 
b/wicket-core/src/main/java/org/apache/wicket/DefaultPageManagerProvider.java
@@ -101,9 +101,9 @@ public class DefaultPageManagerProvider implements 
IPageManagerProvider
                
                store = newCryptingStore(store);
 
-               store = newSerializingStore(store);
-               
                store = newAsynchronousStore(store);
+               
+               store = newSerializingStore(store);
 
                store = newCachingStore(store);
 
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/DefaultPageManagerProviderTest.java
 
b/wicket-core/src/test/java/org/apache/wicket/DefaultPageManagerProviderTest.java
index 7696d9f..ed6c4e8 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/DefaultPageManagerProviderTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/DefaultPageManagerProviderTest.java
@@ -45,9 +45,9 @@ class DefaultPageManagerProviderTest extends WicketTestCase
                RequestPageStore request = 
(RequestPageStore)manager.getPageStore();
                CachingPageStore caching = 
(CachingPageStore)request.getDelegate();
                InSessionPageStore session = 
(InSessionPageStore)caching.getCache();
-               AsynchronousPageStore asynchronous = 
(AsynchronousPageStore)caching.getDelegate();
-               SerializingPageStore serializing = 
(SerializingPageStore)asynchronous.getDelegate();
-               DiskPageStore disk = (DiskPageStore)serializing.getDelegate();
+               SerializingPageStore serializing = 
(SerializingPageStore)caching.getDelegate();
+               AsynchronousPageStore asynchronous = 
(AsynchronousPageStore)serializing.getDelegate();
+               DiskPageStore disk = (DiskPageStore)asynchronous.getDelegate();
                
                assertNotNull(disk);
        }