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 2019/11/27 13:11:28 UTC
[isis] 02/02: ISIS-2158: quickfix simple-app: disable bulk loading
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
commit c48a6ec5a102807c3966b85c6f6e2325cda23c4c
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Nov 27 14:11:12 2019 +0100
ISIS-2158: quickfix simple-app: disable bulk loading
also declares serializable holder of IsisWebAppCommonContext transient
---
.../integration/wicket/AuthenticatedWebSessionForIsis.java | 9 ++++-----
starters/simpleapp/webapp/src/main/resources/application.yml | 2 +-
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/core/viewers/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java b/core/viewers/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
index e665d8f..242dd8e 100644
--- a/core/viewers/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
+++ b/core/viewers/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.wicket.viewer.integration.wicket;
-import org.apache.isis.core.runtime.web.AuthenticationSessionWormhole;
+import java.util.Objects;
+
import org.apache.wicket.Session;
import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
import org.apache.wicket.authroles.authorization.strategies.role.Roles;
@@ -28,6 +29,7 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.isis.applib.clock.Clock;
import org.apache.isis.applib.services.session.SessionLoggingService;
+import org.apache.isis.core.runtime.web.AuthenticationSessionWormhole;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
import org.apache.isis.security.authentication.AuthenticationRequest;
import org.apache.isis.security.authentication.AuthenticationRequestPassword;
@@ -42,9 +44,6 @@ import org.apache.isis.webapp.context.IsisWebAppCommonContext;
import lombok.Getter;
import lombok.val;
-import java.util.List;
-import java.util.Objects;
-
/**
* Viewer-specific implementation of {@link AuthenticatedWebSession}, which
* delegates to the Isis' configured {@link AuthenticationManager}, and which
@@ -62,7 +61,7 @@ implements BreadcrumbModelProvider, BookmarkedPagesModelProvider, IsisWebAppComm
return (AuthenticatedWebSessionForIsis) Session.get();
}
- @Getter protected IsisWebAppCommonContext commonContext;
+ @Getter protected transient IsisWebAppCommonContext commonContext;
private BreadcrumbModel breadcrumbModel;
private BookmarkedPagesModel bookmarkedPagesModel;
diff --git a/starters/simpleapp/webapp/src/main/resources/application.yml b/starters/simpleapp/webapp/src/main/resources/application.yml
index 246021b..2c848c4 100644
--- a/starters/simpleapp/webapp/src/main/resources/application.yml
+++ b/starters/simpleapp/webapp/src/main/resources/application.yml
@@ -134,5 +134,5 @@ isis:
mode: ENABLE_SELECTIVE
standaloneCollection:
- bulkLoad: true
+ bulkLoad: false