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 2021/06/09 12:43:21 UTC
[isis] 05/09: ISIS-2727: stores InteractionContext directly within
InteractionLayer
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2727
in repository https://gitbox.apache.org/repos/asf/isis.git
commit ad179f7afb1ad8e95263bebbb2a4e3aac71e03bf
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jun 9 12:28:43 2021 +0100
ISIS-2727: stores InteractionContext directly within InteractionLayer
... on the way to removing authToUse from InteractionLayer
---
.../org/apache/isis/core/interaction/session/InteractionLayer.java | 3 ++-
.../isis/core/runtimeservices/session/InteractionFactoryDefault.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionLayer.java b/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionLayer.java
index 4c1d706..ba5d76b 100644
--- a/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionLayer.java
+++ b/core/interaction/src/main/java/org/apache/isis/core/interaction/session/InteractionLayer.java
@@ -43,7 +43,8 @@ public class InteractionLayer {
public InteractionLayer(
final @NonNull IsisInteraction interaction,
- final @NonNull Authentication authentication) {
+ final @NonNull Authentication authentication,
+ final @NonNull InteractionContext interactionContext) {
// current thread's Interaction which this layer belongs to,
// meaning the Interaction that holds the stack containing this layer
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/InteractionFactoryDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/InteractionFactoryDefault.java
index f767f3f..89f0293 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/InteractionFactoryDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/InteractionFactoryDefault.java
@@ -184,7 +184,7 @@ implements
return interactionLayerStack.get().peek();
}
- val interactionLayer = new InteractionLayer(isisInteraction, authToUse);
+ val interactionLayer = new InteractionLayer(isisInteraction, authToUse, interactionContextToUse);
interactionLayerStack.get().push(interactionLayer);