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 8b9223c Align with 9.0.x
8b9223c is described below
commit 8b9223c33454897039438af6121e9f53fa227dfc
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Dec 7 11:27:44 2021 +0000
Align with 9.0.x
---
java/org/apache/tomcat/util/buf/ByteChunk.java | 4 ++--
java/org/apache/tomcat/util/buf/LocalStrings.properties | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/tomcat/util/buf/ByteChunk.java
b/java/org/apache/tomcat/util/buf/ByteChunk.java
index 748e101..e3c6a65 100644
--- a/java/org/apache/tomcat/util/buf/ByteChunk.java
+++ b/java/org/apache/tomcat/util/buf/ByteChunk.java
@@ -470,8 +470,8 @@ public final class ByteChunk extends AbstractChunk {
public void flushBuffer() throws IOException {
// assert out!=null
if (out == null) {
- throw new BufferOverflowException(sm.getString("byteChunk.noSink",
- Integer.valueOf(getLimit()),
Integer.valueOf(buff.length)));
+ throw new BufferOverflowException(sm.getString(
+ "chunk.overflow", Integer.valueOf(getLimit()),
Integer.valueOf(buff.length)));
}
out.realWriteBytes(buff, start, end - start);
end = start;
diff --git a/java/org/apache/tomcat/util/buf/LocalStrings.properties
b/java/org/apache/tomcat/util/buf/LocalStrings.properties
index 8440c7f..0f14806 100644
--- a/java/org/apache/tomcat/util/buf/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/buf/LocalStrings.properties
@@ -20,7 +20,7 @@ b2cConverter.unknownEncoding=The character encoding [{0}] is
not supported
byteBufferUtils.cleaner=Cannot use direct ByteBuffer cleaner, memory leaking
may occur
-byteChunk.noSink=Cannot write [{1}] bytes to ByteChunk with limit [{0}] as it
has no sink for overflow
+chunk.overflow=Buffer overflow and no sink is set, limit [{0}] and buffer
length [{1}]
c2bConverter.recycleFailed=Failed to recycle the C2B Converter. Creating new
BufferedWriter, WriteConvertor and IntermediateOutputStream.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
