You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/01/10 13:41:25 UTC
[isis] branch master updated: ISIS-2081: fixes npe with
ActionLayout#redirect for property edits.
This is an automated email from the ASF dual-hosted git repository.
danhaywood 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 4539f97 ISIS-2081: fixes npe with ActionLayout#redirect for property edits.
4539f97 is described below
commit 4539f97c6cc27049c7f451e8ba26573864ddb460
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 10 14:36:16 2019 +0100
ISIS-2081: fixes npe with ActionLayout#redirect for property edits.
---
.../org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
index 6ccd458..179ec08 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
@@ -253,6 +253,10 @@ public final class FormExecutorDefault<M extends BookmarkableModel<ObjectAdapter
final ObjectAdapter resultAdapter,
final RedirectFacet redirectFacet) {
+ if(redirectFacet == null) {
+ return getSettings().isRedirectEvenIfSameObject();
+ }
+
switch (redirectFacet.policy()) {
case EVEN_IF_SAME: