You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2023/06/07 18:02:49 UTC
[tomcat] branch 8.5.x updated: Align with 9.0.x/10.1.x/11.0.x
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 07647966c6 Align with 9.0.x/10.1.x/11.0.x
07647966c6 is described below
commit 07647966c6f157ec65c397a44638521227dcce03
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jun 7 18:29:38 2023 +0100
Align with 9.0.x/10.1.x/11.0.x
---
java/org/apache/tomcat/util/buf/B2CConverter.java | 2 +-
java/org/apache/tomcat/util/buf/ByteBufferUtils.java | 2 +-
java/org/apache/tomcat/util/buf/HexUtils.java | 2 +-
java/org/apache/tomcat/util/buf/LocalStrings.properties | 2 --
4 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/tomcat/util/buf/B2CConverter.java b/java/org/apache/tomcat/util/buf/B2CConverter.java
index 923ed66f9a..a7db2a3385 100644
--- a/java/org/apache/tomcat/util/buf/B2CConverter.java
+++ b/java/org/apache/tomcat/util/buf/B2CConverter.java
@@ -34,7 +34,7 @@ import org.apache.tomcat.util.res.StringManager;
*/
public class B2CConverter {
- private static final StringManager sm = StringManager.getManager(Constants.Package);
+ private static final StringManager sm = StringManager.getManager(B2CConverter.class);
private static final CharsetCache charsetCache = new CharsetCache();
diff --git a/java/org/apache/tomcat/util/buf/ByteBufferUtils.java b/java/org/apache/tomcat/util/buf/ByteBufferUtils.java
index 8a991d8fab..4593fabbad 100644
--- a/java/org/apache/tomcat/util/buf/ByteBufferUtils.java
+++ b/java/org/apache/tomcat/util/buf/ByteBufferUtils.java
@@ -28,7 +28,7 @@ import org.apache.tomcat.util.res.StringManager;
public class ByteBufferUtils {
- private static final StringManager sm = StringManager.getManager(Constants.Package);
+ private static final StringManager sm = StringManager.getManager(ByteBufferUtils.class);
private static final Log log = LogFactory.getLog(ByteBufferUtils.class);
private static final Object unsafe;
diff --git a/java/org/apache/tomcat/util/buf/HexUtils.java b/java/org/apache/tomcat/util/buf/HexUtils.java
index 794658e351..76bb7e0dff 100644
--- a/java/org/apache/tomcat/util/buf/HexUtils.java
+++ b/java/org/apache/tomcat/util/buf/HexUtils.java
@@ -26,7 +26,7 @@ import org.apache.tomcat.util.res.StringManager;
*/
public final class HexUtils {
- private static final StringManager sm = StringManager.getManager(Constants.Package);
+ private static final StringManager sm = StringManager.getManager(HexUtils.class);
// -------------------------------------------------------------- Constants
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings.properties b/java/org/apache/tomcat/util/buf/LocalStrings.properties
index b486d726e1..523cd2dc1b 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings.properties
@@ -20,8 +20,6 @@ b2cConverter.unknownEncoding=The character encoding [{0}] is not supported
byteBufferUtils.cleaner=Cannot use direct ByteBuffer cleaner, memory leaking may occur
-c2bConverter.recycleFailed=Failed to recycle the C2B Converter. Creating new BufferedWriter, WriteConvertor and IntermediateOutputStream.
-
chunk.overflow=Buffer overflow and no sink is set, limit [{0}] and buffer length [{1}]
encodedSolidusHandling.invalid=The value [{0}] is not recognised
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org