WICKET-6702: swap serialization and async to prevent unlocked access to pages
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 @@
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 @@
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);
}
