Author: markt
Date: Mon Nov 10 16:46:40 2014
New Revision: 1637929
URL: http://svn.apache.org/r1637929
Log:
Add common methods to SocketWrapperBase as abstract methods and rename
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletInputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletInputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletInputStream.java
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/coyote/http11/upgrade/AprServletInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletInputStream.java?rev=1637929&r1=1637928&r2=1637929&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletInputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletInputStream.java
Mon Nov 10 16:46:40 2014
@@ -31,16 +31,16 @@ public class AprServletInputStream exten
@Override
protected boolean doIsReady() throws IOException {
- return ((AprSocketWrapper) wrapper).doIsReady();
+ return ((AprSocketWrapper) wrapper).isReady();
}
@Override
protected int doRead(boolean block, byte[] b, int off, int len) throws
IOException {
- return ((AprSocketWrapper) wrapper).doRead(block, b, off, len);
+ return ((AprSocketWrapper) wrapper).read(block, b, off, len);
}
@Override
protected void doClose() throws IOException {
- ((AprSocketWrapper) wrapper).doClose();
+ ((AprSocketWrapper) wrapper).close();
}
}
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletInputStream.java?rev=1637929&r1=1637928&r2=1637929&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletInputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletInputStream.java
Mon Nov 10 16:46:40 2014
@@ -32,16 +32,16 @@ public class Nio2ServletInputStream exte
@Override
protected boolean doIsReady() throws IOException {
- return ((Nio2SocketWrapper) wrapper).doIsReady();
+ return ((Nio2SocketWrapper) wrapper).isReady();
}
@Override
protected int doRead(boolean block, byte[] b, int off, int len) throws
IOException {
- return ((Nio2SocketWrapper) wrapper).doRead(block, b, off, len);
+ return ((Nio2SocketWrapper) wrapper).read(block, b, off, len);
}
@Override
protected void doClose() throws IOException {
- ((Nio2SocketWrapper) wrapper).doClose();
+ ((Nio2SocketWrapper) wrapper).close();
}
}
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletInputStream.java?rev=1637929&r1=1637928&r2=1637929&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletInputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletInputStream.java
Mon Nov 10 16:46:40 2014
@@ -32,16 +32,16 @@ public class NioServletInputStream exten
@Override
protected boolean doIsReady() throws IOException {
- return ((NioSocketWrapper) wrapper).doIsReady();
+ return ((NioSocketWrapper) wrapper).isReady();
}
@Override
protected int doRead(boolean block, byte[] b, int off, int len) throws
IOException {
- return ((NioSocketWrapper) wrapper).doRead(block, b, off, len);
+ return ((NioSocketWrapper) wrapper).read(block, b, off, len);
}
@Override
protected void doClose() throws IOException {
- ((NioSocketWrapper) wrapper).doClose();
+ ((NioSocketWrapper) wrapper).close();
}
}
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=1637929&r1=1637928&r2=1637929&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Nov 10
16:46:40 2014
@@ -2374,8 +2374,8 @@ public class AprEndpoint extends Abstrac
}
- public int doRead(boolean block, byte[] b, int off, int len)
- throws IOException {
+ @Override
+ public int read(boolean block, byte[] b, int off, int len) throws
IOException {
if (closed) {
throw new IOException(sm.getString("socket.apr.closed",
getSocket()));
@@ -2458,12 +2458,14 @@ public class AprEndpoint extends Abstrac
}
- public boolean doIsReady() {
+ @Override
+ public boolean isReady() {
return !eagain;
}
- public void doClose() {
+ @Override
+ public void close() {
closed = true;
// AbstractProcessor needs to trigger the close as multiple closes
for
// APR/native sockets will cause problems.
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=1637929&r1=1637928&r2=1637929&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Mon Nov 10
16:46:40 2014
@@ -805,7 +805,9 @@ public class Nio2Endpoint extends Abstra
public void setSendfileData(SendfileData sf) { this.sendfileData = sf;
}
public SendfileData getSendfileData() { return this.sendfileData; }
- public boolean doIsReady() throws IOException {
+
+ @Override
+ public boolean isReady() throws IOException {
synchronized (completionHandler) {
if (readPending) {
interest = true;
@@ -837,8 +839,9 @@ public class Nio2Endpoint extends Abstra
}
}
- public int doRead(boolean block, byte[] b, int off, int len)
- throws IOException {
+
+ @Override
+ public int read(boolean block, byte[] b, int off, int len) throws
IOException {
synchronized (completionHandler) {
if (readPending) {
@@ -901,10 +904,13 @@ public class Nio2Endpoint extends Abstra
}
}
- public void doClose() throws IOException {
+
+ @Override
+ public void close() throws IOException {
getSocket().close();
}
+
private int fillReadBuffer(boolean block) throws IOException {
ByteBuffer readBuffer =
getSocket().getBufHandler().getReadBuffer();
int nRead = 0;
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=1637929&r1=1637928&r2=1637929&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Mon Nov 10
16:46:40 2014
@@ -1409,7 +1409,9 @@ public class NioEndpoint extends Abstrac
}
public long getWriteTimeout() {return this.writeTimeout;}
- public boolean doIsReady() throws IOException {
+
+ @Override
+ public boolean isReady() throws IOException {
ByteBuffer readBuffer =
getSocket().getBufHandler().getReadBuffer();
if (readBuffer.remaining() > 0) {
@@ -1424,7 +1426,9 @@ public class NioEndpoint extends Abstrac
return isReady;
}
- public int doRead(boolean block, byte[] b, int off, int len)
+
+ @Override
+ public int read(boolean block, byte[] b, int off, int len)
throws IOException {
ByteBuffer readBuffer =
getSocket().getBufHandler().getReadBuffer();
@@ -1470,7 +1474,9 @@ public class NioEndpoint extends Abstrac
return len - leftToWrite;
}
- public void doClose() throws IOException {
+
+ @Override
+ public void close() throws IOException {
getSocket().close();
}
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=1637929&r1=1637928&r2=1637929&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java Mon Nov
10 16:46:40 2014
@@ -16,6 +16,7 @@
*/
package org.apache.tomcat.util.net;
+import java.io.IOException;
import java.util.Iterator;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet;
@@ -183,4 +184,9 @@ public abstract class SocketWrapperBase<
public String toString() {
return super.toString() + ":" + String.valueOf(socket);
}
+
+
+ public abstract int read(boolean block, byte[] b, int off, int len) throws
IOException;
+ public abstract boolean isReady() throws IOException;
+ 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
