You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2023/04/10 09:33:03 UTC
[tomcat] branch 10.1.x updated (4f408d5ae2 -> 7bfca146f6)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 4f408d5ae2 Initialize Random during server initialization
new c42fdbb4dc Align with 9.0.x
new 7bfca146f6 Align with 11.0.x
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java | 2 +-
test/org/apache/tomcat/websocket/server/TestSlowClient.java | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Align with 9.0.x
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit c42fdbb4dcc0874de2033ac61a8f68f0bb59f346
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Apr 6 16:29:31 2023 +0100
Align with 9.0.x
---
test/org/apache/tomcat/websocket/server/TestSlowClient.java | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/test/org/apache/tomcat/websocket/server/TestSlowClient.java b/test/org/apache/tomcat/websocket/server/TestSlowClient.java
index d5d05d81a4..4a093149c5 100644
--- a/test/org/apache/tomcat/websocket/server/TestSlowClient.java
+++ b/test/org/apache/tomcat/websocket/server/TestSlowClient.java
@@ -75,6 +75,11 @@ public class TestSlowClient extends WebSocketBaseTest {
// BZ 64848 (non-container thread variant)
// Confirm there are no waiting processors
AbstractProtocol<?> protocol = (AbstractProtocol<?>) tomcat.getConnector().getProtocolHandler();
+ count = 0;
+ while (protocol.getWaitingProcessorCount() > 0 && count < 200) {
+ Thread.sleep(100);
+ count++;
+ }
Assert.assertEquals(0, protocol.getWaitingProcessorCount());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Align with 11.0.x
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 7bfca146f671f063547b115b7d3ee0f2bf38a03a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Apr 6 16:31:26 2023 +0100
Align with 11.0.x
---
java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java b/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
index de03c64baf..7518a243b7 100644
--- a/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
+++ b/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
@@ -409,7 +409,7 @@ public abstract class WsRemoteEndpointImplBase implements RemoteEndpoint {
}
- protected void endMessage(SendHandler handler, SendResult result) {
+ void endMessage(SendHandler handler, SendResult result) {
boolean doWrite = false;
MessagePart mpNext = null;
synchronized (messagePartLock) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org