Author: markt
Date: Fri Feb 27 15:18:22 2015
New Revision: 1662721
URL: http://svn.apache.org/r1662721
Log:
Pull up common code
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1662721&r1=1662720&r2=1662721&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Fri Feb 27
15:18:22 2015
@@ -2542,16 +2542,6 @@ public class AprEndpoint extends Abstrac
}
-
- @Override
- public void unRead(ByteBuffer returnedInput) {
- if (returnedInput != null) {
- socketBufferHandler.configureReadBufferForWrite();
- socketBufferHandler.getReadBuffer().put(returnedInput);
- }
- }
-
-
@Override
public void close() {
closed = true;
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1662721&r1=1662720&r2=1662721&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Fri Feb 27
15:18:22 2015
@@ -1065,15 +1065,6 @@ public class Nio2Endpoint extends Abstra
@Override
- public void unRead(ByteBuffer returnedInput) {
- if (returnedInput != null) {
- socketBufferHandler.configureReadBufferForWrite();
- socketBufferHandler.getReadBuffer().put(returnedInput);
- }
- }
-
-
- @Override
public void close() throws IOException {
Nio2Channel socket = getSocket();
if (socket != null) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1662721&r1=1662720&r2=1662721&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Fri Feb 27
15:18:22 2015
@@ -1448,15 +1448,6 @@ public class NioEndpoint extends Abstrac
@Override
- public void unRead(ByteBuffer returnedInput) {
- if (returnedInput != null) {
- socketBufferHandler.configureReadBufferForWrite();
- socketBufferHandler.getReadBuffer().put(returnedInput);
- }
- }
-
-
- @Override
public void close() throws IOException {
NioChannel socket = getSocket();
if (socket != null) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java?rev=1662721&r1=1662720&r2=1662721&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java Fri Feb
27 15:18:22 2015
@@ -375,9 +375,16 @@ public abstract class SocketWrapperBase<
* completes, the HTTP handler may read it. This method provides a way for
* that data to be returned so it can be processed by the correct
component.
*
- * @param input The input to return to the input buffer.
+ * @param returnedInput The input to return to the input buffer.
*/
- public abstract void unRead(ByteBuffer input);
+ public void unRead(ByteBuffer returnedInput) {
+ if (returnedInput != null) {
+ socketBufferHandler.configureReadBufferForWrite();
+ socketBufferHandler.getReadBuffer().put(returnedInput);
+ }
+ }
+
+
public abstract void close() throws IOException;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
