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 2020/03/15 10:02:01 UTC

[isis] branch master updated: ISIS-2306: fix regression from previous commit (IsisSession stack)

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 d41b052  ISIS-2306: fix regression from previous commit (IsisSession stack)
d41b052 is described below

commit d41b052f806c3b3d90fa292b9a4beadfe008eb5b
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Mar 15 11:01:51 2020 +0100

    ISIS-2306: fix regression from previous commit (IsisSession stack)
---
 .../core/runtimeservices/session/IsisSessionFactoryDefault.java    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/IsisSessionFactoryDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/IsisSessionFactoryDefault.java
index 546d35a..730db5b 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/IsisSessionFactoryDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/session/IsisSessionFactoryDefault.java
@@ -248,10 +248,9 @@ public class IsisSessionFactoryDefault implements IsisSessionFactory, IsisSessio
         val stack = isisSessionStack.get();
         while(stack.size()>downToStackSize) {
             if(stack.size()==1) {       
-                preTopLevelClose(stack.pop());
-            } else {
-                stack.pop();    
-            }
+                preTopLevelClose(stack.peek());
+            } 
+            stack.pop();    
         }
         if(downToStackSize == 0) {
             isisSessionStack.remove();