Author: remm
Date: Fri Mar 14 14:24:09 2014
New Revision: 1577546
URL: http://svn.apache.org/r1577546
Log:
Experiment some more with this test and NIO2 (sorry for the noise).
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
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=1577546&r1=1577545&r2=1577546&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
Fri Mar 14 14:24:09 2014
@@ -50,11 +50,11 @@ public class TestWebSocketFrameClientSSL
// the websockets writes, which deadlock until timedout.
// Can be reproduced in NIO by adding a Thread.sleep in
// writes. Reenable later when investigated and fixed.
- if (getTomcatInstance().getConnector().getProtocol().equals(
+/* if (getTomcatInstance().getConnector().getProtocol().equals(
"org.apache.coyote.http11.Http11Nio2Protocol")) {
return;
}
-
+*/
Tomcat tomcat = getTomcatInstance();
// Must have a real docBase - just use temp
Context ctx =
@@ -90,7 +90,7 @@ public class TestWebSocketFrameClientSSL
// 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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
