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 2022/10/12 15:42:31 UTC
[tomcat] branch main updated: Avoid overriding non-abstract methods
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 38577bb412 Avoid overriding non-abstract methods
38577bb412 is described below
commit 38577bb41265da04f25013422fc01016f7a5b919
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Oct 12 16:42:23 2022 +0100
Avoid overriding non-abstract methods
Longer term, consider making more methods in AbstractHttp11Protocol
final
---
java/org/apache/coyote/http11/AbstractHttp11Protocol.java | 4 +---
java/org/apache/coyote/http11/Http11Nio2Protocol.java | 7 ++++++-
java/org/apache/coyote/http11/Http11NioProtocol.java | 7 ++++++-
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
index e03a256638..422943ddab 100644
--- a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
+++ b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
@@ -719,9 +719,7 @@ public abstract class AbstractHttp11Protocol<S> extends AbstractProtocol<S> {
// ------------------------------------------------------------- Common code
@Override
- protected Processor createProcessor() {
- return new Http11Processor(this, adapter);
- }
+ protected abstract Processor createProcessor();
@Override
diff --git a/java/org/apache/coyote/http11/Http11Nio2Protocol.java b/java/org/apache/coyote/http11/Http11Nio2Protocol.java
index c5754b6222..da91eb3581 100644
--- a/java/org/apache/coyote/http11/Http11Nio2Protocol.java
+++ b/java/org/apache/coyote/http11/Http11Nio2Protocol.java
@@ -16,6 +16,7 @@
*/
package org.apache.coyote.http11;
+import org.apache.coyote.Processor;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.Nio2Channel;
@@ -39,7 +40,11 @@ public class Http11Nio2Protocol extends AbstractHttp11Protocol<Nio2Channel> {
protected Log getLog() { return log; }
- // ----------------------------------------------------- JMX related methods
+ @Override
+ protected Processor createProcessor() {
+ return new Http11Processor(this, adapter);
+ }
+
@Override
protected String getNamePrefix() {
diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java b/java/org/apache/coyote/http11/Http11NioProtocol.java
index e9271025ef..9af112ceb5 100644
--- a/java/org/apache/coyote/http11/Http11NioProtocol.java
+++ b/java/org/apache/coyote/http11/Http11NioProtocol.java
@@ -16,6 +16,7 @@
*/
package org.apache.coyote.http11;
+import org.apache.coyote.Processor;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.NioChannel;
@@ -63,7 +64,11 @@ public class Http11NioProtocol extends AbstractHttp11Protocol<NioChannel> {
}
- // ----------------------------------------------------- JMX related methods
+ @Override
+ protected Processor createProcessor() {
+ return new Http11Processor(this, adapter);
+ }
+
@Override
protected String getNamePrefix() {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org