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:58:44 UTC

[isis] branch ISIS-2727 updated: ISIS-2727: fixes jdk11 dependency, javadoc is all

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


The following commit(s) were added to refs/heads/ISIS-2727 by this push:
     new 2cf9ef6  ISIS-2727: fixes jdk11 dependency, javadoc is all
2cf9ef6 is described below

commit 2cf9ef623dd18d81ae64ca81b012e76993b47b30
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jun 9 13:58:16 2021 +0100

    ISIS-2727: fixes jdk11 dependency, javadoc is all
---
 .../org/apache/isis/core/interaction/session/InteractionLayer.java   | 5 +++--
 .../isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java     | 2 +-
 2 files changed, 4 insertions(+), 3 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 94443ae..e0626ab 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
@@ -19,15 +19,16 @@
 package org.apache.isis.core.interaction.session;
 
 import org.apache.isis.applib.services.iactnlayer.InteractionContext;
-import org.apache.isis.core.security.authentication.Authentication;
 
 import lombok.Getter;
 import lombok.NonNull;
 
 /**
  * Provides the environment for an (or parts of an) user interaction to be executed.
+ *
  * <p>
- * Can be nested by pushing onto the current thread's {@link InteractionTracker} Stack.
+ * These may be nested (held in a stack), for example for the {@link org.apache.isis.applib.services.sudo.SudoService},
+ * or for fixtures that mock the clock.
  *
  * @since 2.0
  *
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
index 564ac22..b86d192 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
@@ -362,7 +362,7 @@ public class WrapperFactoryDefault implements WrapperFactory {
         val asyncInteractionContext = interactionContextFrom(asyncControl, interactionContext);
 
         val authIfAny = Authentication.authenticationFrom(interactionLayer.getInteractionContext());
-        if(authIfAny.isEmpty()) {
+        if(!authIfAny.isPresent()) {
             return null;
         }