This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 83b69e66eb Fix BZ 63390 - Fix test on Solaris.
83b69e66eb is described below
commit 83b69e66ebbbb9ffbced1c17236340cadc35e431
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Dec 21 15:45:43 2022 +0000
Fix BZ 63390 - Fix test on Solaris.
The first server write after a client close doesn't always trigger an
exception on Solaris. Use additional writes to trigger an exception so
the test passes.
---
test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
index 23491ae6f2..3dfd01942e 100644
--- a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
+++ b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
@@ -1680,7 +1680,13 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
sos.print("TEST");
stage.incrementAndGet();
} else if (stage.get() == 2) {
+ // This should trigger an error as the client closed
the
+ // socket
sos.flush();
+ // Additional writes are required to trigger the error
+ // on solaris
+ sos.print("MORE");
+ log.info("Additional server write after client close
to trigger exception");
}
} while (sos.isReady());
} catch (IOException ioe) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
