You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/02/17 09:27:30 UTC
[isis] branch master updated: ISIS-2530: don't recreate expired
pages
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 7149249 ISIS-2530: don't recreate expired pages
7149249 is described below
commit 7149249e49c301ea0ac3fb6b3ee4898c995f4ecc
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Feb 17 10:27:17 2021 +0100
ISIS-2530: don't recreate expired pages
---
.../viewer/wicket/viewer/integration/WebRequestCycleForIsis.java | 4 ++--
.../isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java | 7 +++++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
index 6fb9ec1..042a139 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
@@ -250,10 +250,10 @@ public class WebRequestCycleForIsis implements IRequestCycleListener {
// avoid infinite redirect loops
RedirectPolicy redirectPolicy = ex instanceof PageExpiredException
? RedirectPolicy.NEVER_REDIRECT
- : RedirectPolicy.ALWAYS_REDIRECT;
+ : RedirectPolicy.ALWAYS_REDIRECT;
return errorPageProvider != null
? new RenderPageRequestHandler(errorPageProvider, redirectPolicy)
- : null;
+ : null;
}
private IRequestHandler respondGracefully(final RequestCycle cycle) {
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
index a56f7fd..322ffec 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
@@ -317,6 +317,9 @@ implements
settings.setThemeProvider(themeSupport.getThemeProvider());
});
+ //XXX ISIS-2530, don't recreate expired pages
+ getPageSettings().setRecreateBookmarkablePagesAfterExpiry(false);
+
}
/*
@@ -360,7 +363,7 @@ implements
String defaultEncryptionKey() {
return systemEnvironment.isPrototyping()
? "PrototypingEncryptionKey"
- : UUID.randomUUID().toString();
+ : UUID.randomUUID().toString();
}
private void configureWicketSelect2() {
@@ -540,7 +543,7 @@ implements
return systemEnvironment.isPrototyping()
? RuntimeConfigurationType.DEVELOPMENT
- : RuntimeConfigurationType.DEPLOYMENT;
+ : RuntimeConfigurationType.DEPLOYMENT;
}
// /////////////////////////////////////////////////