Author: markt
Date: Fri Jan 9 15:43:07 2015
New Revision: 1650571
URL: http://svn.apache.org/r1650571
Log:
Fix failures on Windows
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/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=1650571&r1=1650570&r2=1650571&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Fri Jan 9
15:43:07 2015
@@ -2618,16 +2618,6 @@ public class AprEndpoint extends Abstrac
@Override
- public boolean isReadyForWrite() {
- boolean result = super.isReadyForWrite();
- if (!result) {
- registerWriteInterest();
- }
- return result;
- }
-
-
- @Override
public void registerWriteInterest() {
((AprEndpoint)
getEndpoint()).getPoller().add(getSocket().longValue(), -1, false, 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=1650571&r1=1650570&r2=1650571&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
15:43:07 2015
@@ -1269,16 +1269,6 @@ public class Nio2Endpoint extends Abstra
@Override
- public boolean isReadyForWrite() {
- boolean result = super.isReadyForWrite();
- if (!result) {
- writeInterest = true;
- }
- return result;
- }
-
-
- @Override
public void registerWriteInterest() {
synchronized (writeCompletionHandler) {
if (writePending.availablePermits() == 0) {
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=1650571&r1=1650570&r2=1650571&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 15:43:07 2015
@@ -188,8 +188,11 @@ public abstract class SocketWrapperBase<
}
public boolean isReadyForWrite() {
- // TODO Review use of this, hasDataForWrite() and
registerWriteInterest()
- return !hasDataToWrite();
+ boolean result = !hasDataToWrite();
+ if (!result) {
+ registerWriteInterest();
+ }
+ return result;
}
public void addDispatch(DispatchType dispatchType) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
