[security] When destroying conversations do not abort if they are det…

…ached
fjalvingh · Dec 30, 2024 · bd21015 · bd21015
1 parent 987ed2a
commit bd21015
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/to.etc.domui/src/main/java/to/etc/domui/server/DomApplication.java b/to.etc.domui/src/main/java/to/etc/domui/server/DomApplication.java
@@ -609,7 +609,7 @@ private void reapOldPages() {
 			pages.sort(Comparator.comparing(a -> a.getLastClickTime()));
 
 			//-- Remove the eldest pages
-			toRemove = pages.subList(0, pages.size() - MAX_PAGES - 500);
+			toRemove = pages.subList(0, pages.size() - (MAX_PAGES - 500));
 			m_activePageList.removeAll(toRemove);
 		}
 
@@ -626,6 +626,7 @@ private void reapOldPages() {
 				}
 			} catch(Exception x) {
 				System.out.println("Failed to destroy page: " + x);
+				//x.printStackTrace();
 			}
 		}
 	}

diff --git a/to.etc.domui/src/main/java/to/etc/domui/state/WindowSession.java b/to.etc.domui/src/main/java/to/etc/domui/state/WindowSession.java
@@ -271,7 +271,7 @@ void destroyConversation(@NonNull final ConversationContext cc) {
 			IShelvedEntry she = m_shelvedPageStack.get(i);
 			if(she instanceof ShelvedDomUIPage) {
 				ShelvedDomUIPage sdp = (ShelvedDomUIPage) she;
-				if(sdp.getPage().getConversation() == cc) {
+				if(sdp.getPage().internalGetConversation() == cc) {
 					m_shelvedPageStack.remove(i);
 				}
 			}