From 35b8e5ba9678d5963a69f0056514305c6c99261d Mon Sep 17 00:00:00 2001
From: Mark Thomas <markt@apache.org>
Date: Thu, 27 Jul 2023 11:42:57 +0100
Subject: [PATCH] Simplify the logic

---
 .../tomcat/websocket/server/WsRemoteEndpointImplServer.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java b/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
index 396de502e3bb..b520f394afbe 100644
--- a/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
+++ b/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
@@ -110,8 +110,7 @@ protected boolean acquireMessagePartInProgressSemaphore(byte opCode, long timeou
 
         int socketWrapperLockCount = socketWrapper.getLock().getHoldCount();
         while (!messagePartInProgress.tryAcquire()) {
-            long timeout = timeoutExpiry - System.currentTimeMillis();
-            if (timeout < 0) {
+            if (timeoutExpiry < System.currentTimeMillis()) {
                 return false;
             }
             try {