Author: markt
Date: Fri Jan 9 13:39:51 2015
New Revision: 1650527
URL: http://svn.apache.org/r1650527
Log:
Simplify. Entries are removed from bufferedWrites as soon as they are fully
written so the code only needs to check for size() > 0.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
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=1650527&r1=1650526&r2=1650527&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Fri Jan 9
13:39:51 2015
@@ -1253,7 +1253,7 @@ public class Nio2Endpoint extends Abstra
}
}
}
- return hasMoreDataToFlush() || hasBufferedData() ||
getError() != null;
+ return hasDataToWrite();
}
}
}
@@ -1262,7 +1262,7 @@ public class Nio2Endpoint extends Abstra
@Override
public boolean hasDataToWrite() {
synchronized (writeCompletionHandler) {
- return hasMoreDataToFlush() || hasBufferedData() || getError()
!= null;
+ return hasMoreDataToFlush() || bufferedWrites.size() > 0 ||
getError() != 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=1650527&r1=1650526&r2=1650527&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java Fri Jan
9 13:39:51 2015
@@ -183,17 +183,8 @@ public abstract class SocketWrapperBase<
(!writeBufferFlipped && socketWriteBuffer.position() > 0);
}
- protected boolean hasBufferedData() {
- boolean result = false;
- Iterator<ByteBufferHolder> iter = bufferedWrites.iterator();
- while (!result && iter.hasNext()) {
- result = iter.next().hasData();
- }
- return result;
- }
-
public boolean hasDataToWrite() {
- return hasMoreDataToFlush() || hasBufferedData();
+ return hasMoreDataToFlush() || bufferedWrites.size() > 0;
}
public boolean isReadyForWrite() {
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java?rev=1650527&r1=1650526&r2=1650527&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
Fri Jan 9 13:39:51 2015
@@ -69,7 +69,7 @@ public class TestWebSocketFrameClient ex
// Ignore the latch result as the message count test below will tell us
// if the right number of messages arrived
- handler.getLatch().await(TesterFirehoseServer.WAIT_TIME_MILLIS,
+ handler.getLatch().await(TesterFirehoseServer.WAIT_TIME_MILLIS / 4,
TimeUnit.MILLISECONDS);
Queue<String> messages = handler.getMessages();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
