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 2017/09/05 09:43:39 UTC
svn commit: r1807324 - in /tomcat/trunk/java/org/apache/coyote:
AbstractProcessor.java ajp/AbstractAjpProtocol.java ajp/AjpProcessor.java
http11/AbstractHttp11Protocol.java http11/Http11Processor.java
http2/StreamProcessor.java
Author: markt
Date: Tue Sep 5 09:43:38 2017
New Revision: 1807324
URL: http://svn.apache.org/viewvc?rev=1807324&view=rev
Log:
Refactor: Make adapter reference final
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1807324&r1=1807323&r2=1807324&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Tue Sep 5 09:43:38 2017
@@ -42,7 +42,7 @@ public abstract class AbstractProcessor
private static final StringManager sm = StringManager.getManager(AbstractProcessor.class);
- protected Adapter adapter;
+ protected final Adapter adapter;
protected final AsyncStateMachine asyncStateMachine;
private volatile long asyncTimeout = -1;
protected final Request request;
@@ -57,12 +57,13 @@ public abstract class AbstractProcessor
private ErrorState errorState = ErrorState.NONE;
- public AbstractProcessor() {
- this(new Request(), new Response());
+ public AbstractProcessor(Adapter adapter) {
+ this(adapter, new Request(), new Response());
}
- protected AbstractProcessor(Request coyoteRequest, Response coyoteResponse) {
+ protected AbstractProcessor(Adapter adapter, Request coyoteRequest, Response coyoteResponse) {
+ this.adapter = adapter;
asyncStateMachine = new AsyncStateMachine(this);
request = coyoteRequest;
response = coyoteResponse;
@@ -113,16 +114,6 @@ public abstract class AbstractProcessor
}
- /**
- * Set the associated adapter.
- *
- * @param adapter the new adapter
- */
- public void setAdapter(Adapter adapter) {
- this.adapter = adapter;
- }
-
-
/**
* Get the associated adapter.
*
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1807324&r1=1807323&r2=1807324&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Tue Sep 5 09:43:38 2017
@@ -195,8 +195,7 @@ public abstract class AbstractAjpProtoco
@Override
protected Processor createProcessor() {
- AjpProcessor processor = new AjpProcessor(this);
- processor.setAdapter(getAdapter());
+ AjpProcessor processor = new AjpProcessor(this, getAdapter());
return processor;
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1807324&r1=1807323&r2=1807324&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Tue Sep 5 09:43:38 2017
@@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.coyote.AbstractProcessor;
import org.apache.coyote.ActionCode;
+import org.apache.coyote.Adapter;
import org.apache.coyote.ErrorState;
import org.apache.coyote.InputBuffer;
import org.apache.coyote.OutputBuffer;
@@ -244,8 +245,8 @@ public class AjpProcessor extends Abstra
// ------------------------------------------------------------ Constructor
- public AjpProcessor(AbstractAjpProtocol<?> protocol) {
- super();
+ public AjpProcessor(AbstractAjpProtocol<?> protocol, Adapter adapter) {
+ super(adapter);
this.protocol = protocol;
int packetSize = protocol.getPacketSize();
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1807324&r1=1807323&r2=1807324&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Tue Sep 5 09:43:38 2017
@@ -934,8 +934,7 @@ public abstract class AbstractHttp11Prot
@Override
protected Processor createProcessor() {
- Http11Processor processor = new Http11Processor(this);
- processor.setAdapter(getAdapter());
+ Http11Processor processor = new Http11Processor(this, adapter);
return processor;
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1807324&r1=1807323&r2=1807324&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Tue Sep 5 09:43:38 2017
@@ -27,6 +27,7 @@ import javax.servlet.http.HttpServletRes
import org.apache.coyote.AbstractProcessor;
import org.apache.coyote.ActionCode;
+import org.apache.coyote.Adapter;
import org.apache.coyote.ErrorState;
import org.apache.coyote.Request;
import org.apache.coyote.RequestInfo;
@@ -149,8 +150,8 @@ public class Http11Processor extends Abs
private SendfileDataBase sendfileData = null;
- public Http11Processor(AbstractHttp11Protocol<?> protocol) {
- super();
+ public Http11Processor(AbstractHttp11Protocol<?> protocol, Adapter adapter) {
+ super(adapter);
this.protocol = protocol;
userDataHelper = new UserDataHelper(log);
Modified: tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java?rev=1807324&r1=1807323&r2=1807324&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Tue Sep 5 09:43:38 2017
@@ -45,10 +45,9 @@ class StreamProcessor extends AbstractPr
StreamProcessor(Http2UpgradeHandler handler, Stream stream, Adapter adapter,
SocketWrapperBase<?> socketWrapper) {
- super(stream.getCoyoteRequest(), stream.getCoyoteResponse());
+ super(adapter, stream.getCoyoteRequest(), stream.getCoyoteResponse());
this.handler = handler;
this.stream = stream;
- setAdapter(adapter);
setSocketWrapper(socketWrapper);
}
@@ -235,7 +234,6 @@ class StreamProcessor extends AbstractPr
// Clear fields that can be cleared to aid GC and trigger NPEs if this
// is reused
setSocketWrapper(null);
- setAdapter(null);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org