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 875fff3abf Align comments with 11.0.x. No functional change.
875fff3abf is described below
commit 875fff3abfba99eb0159a509a0da7d075fa0a253
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jul 22 17:41:55 2024 +0100
Align comments with 11.0.x. No functional change.
---
java/org/apache/coyote/http11/Http11InputBuffer.java | 6 ++++--
java/org/apache/coyote/http11/Http11Nio2Protocol.java | 2 --
java/org/apache/coyote/http11/Http11NioProtocol.java | 2 --
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/coyote/http11/Http11InputBuffer.java
b/java/org/apache/coyote/http11/Http11InputBuffer.java
index 615f7f2903..af34736a2d 100644
--- a/java/org/apache/coyote/http11/Http11InputBuffer.java
+++ b/java/org/apache/coyote/http11/Http11InputBuffer.java
@@ -751,12 +751,14 @@ public class Http11InputBuffer implements InputBuffer,
ApplicationBufferHandler
}
- // --------------------------------------------------------- Private
Methods
-
/**
* Attempts to read some data into the input buffer.
*
+ * @param block Should blocking IO be used when filling the input buffer
+ *
* @return <code>true</code> if more data was added to the input buffer
otherwise <code>false</code>
+ *
+ * @throws IOException if an IO error occurs while filling the input buffer
*/
private boolean fill(boolean block) throws IOException {
diff --git a/java/org/apache/coyote/http11/Http11Nio2Protocol.java
b/java/org/apache/coyote/http11/Http11Nio2Protocol.java
index 2d0bbfa844..ea53005ed7 100644
--- a/java/org/apache/coyote/http11/Http11Nio2Protocol.java
+++ b/java/org/apache/coyote/http11/Http11Nio2Protocol.java
@@ -46,8 +46,6 @@ public class Http11Nio2Protocol extends
AbstractHttp11JsseProtocol<Nio2Channel>
}
- // ----------------------------------------------------- JMX related
methods
-
@Override
protected String getNamePrefix() {
if (isSSLEnabled()) {
diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java
b/java/org/apache/coyote/http11/Http11NioProtocol.java
index 98b5ccd71b..20ff79b052 100644
--- a/java/org/apache/coyote/http11/Http11NioProtocol.java
+++ b/java/org/apache/coyote/http11/Http11NioProtocol.java
@@ -65,8 +65,6 @@ public class Http11NioProtocol extends
AbstractHttp11JsseProtocol<NioChannel> {
}
- // ----------------------------------------------------- JMX related
methods
-
@Override
protected String getNamePrefix() {
if (isSSLEnabled()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
