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 2015/01/05 22:41:25 UTC
svn commit: r1649671 - in /tomcat/trunk/java/org/apache/tomcat/util/net:
AprEndpoint.java Nio2Endpoint.java NioEndpoint.java SocketWrapperBase.java
Author: markt
Date: Mon Jan 5 21:41:25 2015
New Revision: 1649671
URL: http://svn.apache.org/r1649671
Log:
Remove unused flush() method.
Note that flush() (in some form) will alomst certainly return to the
SocketWrapper in a future refactoring.
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=1649671&r1=1649670&r2=1649671&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Jan 5 21:41:25 2015
@@ -2606,12 +2606,6 @@ public class AprEndpoint extends Abstrac
@Override
- public void flush() {
- // NO-OP
- }
-
-
- @Override
public void regsiterForEvent(boolean read, boolean write) {
((AprEndpoint) getEndpoint()).getPoller().add(
getSocket().longValue(), -1, read, write);
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=1649671&r1=1649670&r2=1649671&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Mon Jan 5 21:41:25 2015
@@ -1067,30 +1067,6 @@ public class Nio2Endpoint extends Abstra
@Override
- public void flush() throws IOException {
- try {
- // Block until a possible non blocking write is done
- if (writePending.tryAcquire(getTimeout(), TimeUnit.MILLISECONDS)) {
- writePending.release();
- getSocket().flush().get(getTimeout(), TimeUnit.MILLISECONDS);
- } else {
- throw new TimeoutException();
- }
- } catch (ExecutionException e) {
- if (e.getCause() instanceof IOException) {
- throw (IOException) e.getCause();
- } else {
- throw new IOException(e);
- }
- } catch (InterruptedException e) {
- throw new IOException(e);
- } catch (TimeoutException e) {
- SocketTimeoutException ex = new SocketTimeoutException();
- throw ex;
- }
- }
-
- @Override
public void regsiterForEvent(boolean read, boolean write) {
// NO-OP. Appropriate handlers will already have been registered.
}
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=1649671&r1=1649670&r2=1649671&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Mon Jan 5 21:41:25 2015
@@ -1576,33 +1576,6 @@ public class NioEndpoint extends Abstrac
@Override
- public void flush() throws IOException {
- NioEndpoint.NioSocketWrapper att =
- (NioEndpoint.NioSocketWrapper) getSocket().getAttachment();
- if (att == null) {
- throw new IOException("Key must be cancelled");
- }
- long writeTimeout = att.getWriteTimeout();
- Selector selector = null;
- try {
- selector = pool.get();
- } catch ( IOException x ) {
- //ignore
- }
- try {
- do {
- if (getSocket().flush(true, selector, writeTimeout)) {
- break;
- }
- } while (true);
- } finally {
- if (selector != null) {
- pool.put(selector);
- }
- }
- }
-
- @Override
public void regsiterForEvent(boolean read, boolean write) {
SelectionKey key = getSocket().getIOChannel().keyFor(
getSocket().getPoller().getSelector());
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=1649671&r1=1649670&r2=1649671&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java Mon Jan 5 21:41:25 2015
@@ -234,7 +234,6 @@ public abstract class SocketWrapperBase<
public abstract void close() throws IOException;
public abstract int write(boolean block, byte[] b, int off, int len) throws IOException;
- public abstract void flush() throws IOException;
public abstract void regsiterForEvent(boolean read, boolean write);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org