This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 07d1025ac0 Fix incorrect error message
07d1025ac0 is described below
commit 07d1025ac02d6b934723e978214816ba35fa9ee1
Author: Mark Thomas <[email protected]>
AuthorDate: Tue May 7 20:36:37 2024 +0100
Fix incorrect error message
---
java/org/apache/coyote/http2/LocalStrings.properties | 1 +
java/org/apache/coyote/http2/StreamStateMachine.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties
b/java/org/apache/coyote/http2/LocalStrings.properties
index 0213ca23ef..5f6cadde11 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -124,6 +124,7 @@ streamProcessor.service.error=Error during request
processing
streamStateMachine.debug.change=Connection [{0}], Stream [{1}], State changed
from [{2}] to [{3}]
streamStateMachine.invalidFrame=Connection [{0}], Stream [{1}], State [{2}],
Frame type [{3}]
+streamStateMachine.invalidReset=Connection [{0}], Stream [{1}], Stream may not
be reset when IDLE
upgradeHandler.allocate.debug=Connection [{0}], Stream [{1}], allocated [{2}]
bytes
upgradeHandler.allocate.left=Connection [{0}], Stream [{1}], [{2}] bytes
unallocated - trying to allocate to children
diff --git a/java/org/apache/coyote/http2/StreamStateMachine.java
b/java/org/apache/coyote/http2/StreamStateMachine.java
index e6f1f24b83..fcb41f2a45 100644
--- a/java/org/apache/coyote/http2/StreamStateMachine.java
+++ b/java/org/apache/coyote/http2/StreamStateMachine.java
@@ -85,7 +85,7 @@ class StreamStateMachine {
public synchronized void sendReset() {
if (state == State.IDLE) {
throw new IllegalStateException(
- sm.getString("streamStateMachine.debug.change",
connectionId, streamId, state));
+ sm.getString("streamStateMachine.invalidReset",
connectionId, streamId));
}
if (state.canReset()) {
stateChange(state, State.CLOSED_RST_TX);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
