From e9f1767e5b1b51f6793f9aa44ceaca65027a81d5 Mon Sep 17 00:00:00 2001
From: Jack Lu <Jack.S.Lu@ibm.com>
Date: Fri, 21 Mar 2025 17:40:57 -0400
Subject: [PATCH] Simplify removeContinuationFromList loop logic

Signed-off-by: Jack Lu <Jack.S.Lu@ibm.com>
---
 runtime/oti/ContinuationHelpers.hpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/runtime/oti/ContinuationHelpers.hpp b/runtime/oti/ContinuationHelpers.hpp
index e48e717a1c2..1cc0191a852 100644
--- a/runtime/oti/ContinuationHelpers.hpp
+++ b/runtime/oti/ContinuationHelpers.hpp
@@ -303,22 +303,18 @@ class VM_ContinuationHelpers {
 	removeContinuationFromList(J9VMContinuation **list, J9VMContinuation *continuation)
 	{
 		bool foundInList = false;
-		J9VMContinuation *previous = NULL;
 		J9VMContinuation *current = *list;
 
 		while (NULL != current) {
 			if (continuation == current) {
 				foundInList = true;
-				if (NULL == previous) {
-					*list = current->nextWaitingContinuation;
-				} else {
-					previous->nextWaitingContinuation = current->nextWaitingContinuation;
-				}
+				/* Remove Continuation from the linked list. */
+				*list = current->nextWaitingContinuation;
 				current->nextWaitingContinuation = NULL;
 				break;
 			}
-			previous = current;
-			current = current->nextWaitingContinuation;
+			link = &current->nextWaitingContinuation;
+			current = *link;
 		}
 
 		return foundInList;