Author: markt
Date: Fri Aug 12 07:47:58 2016
New Revision: 1756111
URL: http://svn.apache.org/viewvc?rev=1756111&view=rev
Log:
Provide default implementation to reduce duplication
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.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=1756111&r1=1756110&r2=1756111&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Fri Aug 12
07:47:58 2016
@@ -583,7 +583,15 @@ public abstract class AbstractProcessor
}
- protected abstract void populateRequestAttributeRemoteHost();
+ /**
+ * Populate the remote host request attribute. Processors (e.g. AJP) that
+ * populate this from an alternative source should override this method.
+ */
+ protected void populateRequestAttributeRemoteHost() {
+ if (getPopulateRequestAttributesFromSocket() && socketWrapper != null)
{
+ request.remoteHost().setString(socketWrapper.getRemoteHost());
+ }
+ }
/**
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=1756111&r1=1756110&r2=1756111&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Fri Aug 12
07:47:58 2016
@@ -1538,14 +1538,6 @@ public class Http11Processor extends Abs
@Override
- protected final void populateRequestAttributeRemoteHost() {
- if (getPopulateRequestAttributesFromSocket() && socketWrapper != null)
{
- request.remoteHost().setString(socketWrapper.getRemoteHost());
- }
- }
-
-
- @Override
protected final void sslReHandShake() {
if (sslSupport != null) {
// Consume and buffer the request body, so that it does not
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=1756111&r1=1756110&r2=1756111&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Fri Aug 12
07:47:58 2016
@@ -153,14 +153,6 @@ public class StreamProcessor extends Abs
@Override
- protected final void populateRequestAttributeRemoteHost() {
- if (getPopulateRequestAttributesFromSocket() && socketWrapper != null)
{
- request.remoteHost().setString(socketWrapper.getRemoteHost());
- }
- }
-
-
- @Override
protected final boolean isRequestBodyFullyRead() {
return stream.getInputBuffer().isRequestBodyFullyRead();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
