Author: remm
Date: Wed Apr 9 23:57:09 2014
New Revision: 1586177
URL: http://svn.apache.org/r1586177
Log:
Does not fix the testsuite run, so revert.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletOutputStream.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java?rev=1586177&r1=1586176&r2=1586177&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
Wed Apr 9 23:57:09 2014
@@ -76,9 +76,6 @@ public abstract class AbstractServletOut
synchronized (fireListenerLock) {
boolean result = (buffer == null);
fireListener = !result;
- if (fireListener) {
- registerWriteInterest();
- }
return result;
}
}
@@ -239,8 +236,4 @@ public abstract class AbstractServletOut
protected abstract void doFlush() throws IOException;
protected abstract void doClose() throws IOException;
-
- protected void registerWriteInterest() {
- }
-
}
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletOutputStream.java?rev=1586177&r1=1586176&r2=1586177&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletOutputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletOutputStream.java
Wed Apr 9 23:57:09 2014
@@ -176,14 +176,4 @@ public class Nio2ServletOutputStream ext
channel.close(true);
}
- @Override
- protected void registerWriteInterest() {
- synchronized (completionHandler) {
- if (writePending.availablePermits() > 0) {
- // If no write is pending, notify
- endpoint.processSocket(socketWrapper, SocketStatus.OPEN_WRITE,
true);
- }
- }
- }
-
}
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java?rev=1586177&r1=1586176&r2=1586177&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
Wed Apr 9 23:57:09 2014
@@ -46,6 +46,11 @@ public class TestWebSocketFrameClientSSL
@Test
public void testConnectToServerEndpoint() throws Exception {
+ Assume.assumeFalse(
+ "Skip this test on NIO2. FIXME: NIO2 SSL only issue.",
+ getTomcatInstance().getConnector().getProtocol()
+ .equals("org.apache.coyote.http11.Http11Nio2Protocol"));
+
Tomcat tomcat = getTomcatInstance();
// Must have a real docBase - just use temp
Context ctx =
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
