(tomcat) branch 10.1.x updated: Better log message trying to remove Processor from waitingProcessors

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.1.x by this push:
     new 3d0831fb7c Better log message trying to remove Processor from 
waitingProcessors
3d0831fb7c is described below

commit 3d0831fb7cd19dbec4ec7f2ebba15c03e3f9e030
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Sep 13 14:06:17 2024 +0100

    Better log message trying to remove Processor from waitingProcessors
---
 java/org/apache/coyote/AbstractProtocol.java   | 5 +++--
 java/org/apache/coyote/LocalStrings.properties | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/coyote/AbstractProtocol.java 
b/java/org/apache/coyote/AbstractProtocol.java
index 662b3fdfb6..9f60d2e6e5 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -444,10 +444,11 @@ public abstract class AbstractProtocol<S> implements 
ProtocolHandler, MBeanRegis
 
 
     public void removeWaitingProcessor(Processor processor) {
+        boolean result = waitingProcessors.remove(processor);
         if (getLog().isTraceEnabled()) {
-            
getLog().trace(sm.getString("abstractProtocol.waitingProcessor.remove", 
processor));
+            getLog().trace(sm.getString(
+                    "abstractProtocol.waitingProcessor.remove", processor, 
Boolean.valueOf(result)));
         }
-        waitingProcessors.remove(processor);
     }
 
 
diff --git a/java/org/apache/coyote/LocalStrings.properties 
b/java/org/apache/coyote/LocalStrings.properties
index cffa960ef7..7bd2b65303 100644
--- a/java/org/apache/coyote/LocalStrings.properties
+++ b/java/org/apache/coyote/LocalStrings.properties
@@ -40,7 +40,7 @@ abstractProtocol.mbeanDeregistrationFailed=Failed to 
deregister MBean named [{0}
 abstractProtocol.processorRegisterError=Error registering request processor
 abstractProtocol.processorUnregisterError=Error unregistering request processor
 abstractProtocol.waitingProcessor.add=Adding processor [{0}] to waiting 
processors
-abstractProtocol.waitingProcessor.remove=Removed processor [{0}] from waiting 
processors
+abstractProtocol.waitingProcessor.remove=Called remove for processor [{0}] 
from waiting processors with result [{1}]
 
 abstractProtocolHandler.asyncTimeoutError=Error processing async timeouts
 abstractProtocolHandler.destroy=Destroying ProtocolHandler [{0}]


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org