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

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

commit 22fd12a278e39dc785b437318c8349b2737523f1
Author: opencode <[email protected]>
AuthorDate: Thu Nov 5 12:07:44 2026 +0100

    Fix quote escaping in the cleaner rearm message
    
    The connectionPool.cleanerRearmFailed text is fetched through the 
no-argument MessageFactory.get(String), which returns the bundle text verbatim, 
but the text contained the MessageFormat escape for an apostrophe. The log line 
therefore read pool''s instead of pool's. Write the apostrophe literally, as 
the bundle does for its other no-argument messages.
---
 .../main/java/org/apache/tomcat/jdbc/pool/util/LocalStrings.properties  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/util/LocalStrings.properties
 
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/util/LocalStrings.properties
index 10c627c76c..326816cf97 100644
--- 
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/util/LocalStrings.properties
+++ 
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/util/LocalStrings.properties
@@ -37,7 +37,7 @@ classLoaderUtil.classLoadersNone=Unable to load class [{0}]: 
no class loaders su
 connectionPool.alternateUsernameIgnored=alternateUsernameAllowed is set to 
false so the provided user name [{0}] and associated password have been ignored 
for this borrow
 connectionPool.checkAbandonedFailed=checkAbandoned failed, it will be retried.
 connectionPool.checkIdleFailed=checkIdle failed, it will be retried.
-connectionPool.cleanerRearmFailed=A pool maintenance task could not be armed 
again after the shared pool cleaner timer was replaced. That pool''s idle 
checks and abandoned connection check do not run until its sweeper is armed 
again.
+connectionPool.cleanerRearmFailed=A pool maintenance task could not be armed 
again after the shared pool cleaner timer was replaced. That pool's idle checks 
and abandoned connection check do not run until its sweeper is armed again.
 connectionPool.cleanerSchedulingFailed=The pool maintenance task could not be 
scheduled on the pool cleaner timer and will not run. A timer task can be 
scheduled once only, so this task has been started before; create a new task 
rather than starting this one again.
 connectionPool.cleanerTimerReplaced=The shared pool cleaner timer had stopped, 
so the maintenance tasks scheduled on it no longer run. A replacement timer has 
been created for the pool that needed one, and the {0} task or tasks the dead 
timer held are being armed again on it.
 connectionPool.connectionAbandoned=Connection has been abandoned {0}:{1}


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to