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 169aa4042d Pull up common method
169aa4042d is described below
commit 169aa4042d04bcc1171a9ea00654ef499455b1e5
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Jul 22 17:29:21 2024 +0100
Pull up common method
The refactoring was originally implemented to support the experimental
and now deleted loom module.
---
java/org/apache/coyote/http11/AbstractHttp11Protocol.java | 5 ++++-
java/org/apache/coyote/http11/Http11Nio2Protocol.java | 7 -------
java/org/apache/coyote/http11/Http11NioProtocol.java | 7 -------
3 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
index fe4380dbe2..9e6d358d62 100644
--- a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
+++ b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
@@ -751,7 +751,10 @@ public abstract class AbstractHttp11Protocol<S> extends
AbstractProtocol<S> {
// ------------------------------------------------------------- Common
code
@Override
- protected abstract Processor createProcessor();
+ protected Processor createProcessor() {
+ Http11Processor processor = new Http11Processor(this, adapter);
+ return processor;
+ }
@Override
diff --git a/java/org/apache/coyote/http11/Http11Nio2Protocol.java
b/java/org/apache/coyote/http11/Http11Nio2Protocol.java
index 798c02431c..9eb346f126 100644
--- a/java/org/apache/coyote/http11/Http11Nio2Protocol.java
+++ b/java/org/apache/coyote/http11/Http11Nio2Protocol.java
@@ -16,7 +16,6 @@
*/
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;
@@ -47,12 +46,6 @@ public class Http11Nio2Protocol extends
AbstractHttp11Protocol<Nio2Channel> {
}
- @Override
- protected Processor createProcessor() {
- return new Http11Processor(this, adapter);
- }
-
-
@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 57068d795e..39a43b9890 100644
--- a/java/org/apache/coyote/http11/Http11NioProtocol.java
+++ b/java/org/apache/coyote/http11/Http11NioProtocol.java
@@ -16,7 +16,6 @@
*/
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;
@@ -66,12 +65,6 @@ public class Http11NioProtocol extends
AbstractHttp11Protocol<NioChannel> {
}
- @Override
- protected Processor createProcessor() {
- return new Http11Processor(this, adapter);
- }
-
-
@Override
protected String getNamePrefix() {
if (isSSLEnabled()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
