You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2026/10/13 11:17:21 UTC
(tomcat) 16/16: Fix merge issues
This is an automated email from the ASF dual-hosted git repository.
rmaucher pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit e9ab89c1c6f30396d7f88100c9920658ff3e68e6
Author: remm <re...@apache.org>
AuthorDate: Tue Oct 13 13:16:49 2026 +0200
Fix merge issues
---
test/org/apache/coyote/TestAbstractProcessorAsyncTimeout.java | 11 ++++++++---
test/org/apache/coyote/TestRequest.java | 1 +
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/test/org/apache/coyote/TestAbstractProcessorAsyncTimeout.java b/test/org/apache/coyote/TestAbstractProcessorAsyncTimeout.java
index a6ff23163a..6eb9c84ebc 100644
--- a/test/org/apache/coyote/TestAbstractProcessorAsyncTimeout.java
+++ b/test/org/apache/coyote/TestAbstractProcessorAsyncTimeout.java
@@ -56,7 +56,9 @@ public class TestAbstractProcessorAsyncTimeout {
processor.timeoutAsync(asyncStart + 2000);
- Assert.assertEquals("The timeout should have been dispatched", List.of(SocketEvent.TIMEOUT),
+ ArrayList<SocketEvent> timeoutList = new ArrayList<>();
+ timeoutList.add(SocketEvent.TIMEOUT);
+ Assert.assertEquals("The timeout should have been dispatched", timeoutList,
processor.getDispatchedEvents());
Assert.assertTrue("The timeout must remain in place until it has been processed",
processor.getAsyncTimeout() > 0);
@@ -64,8 +66,11 @@ public class TestAbstractProcessorAsyncTimeout {
// The event was not processed, so this run of the timeout task has to dispatch it again.
processor.timeoutAsync(asyncStart + 4000);
+ ArrayList<SocketEvent> timeoutsList = new ArrayList<>();
+ timeoutsList.add(SocketEvent.TIMEOUT);
+ timeoutsList.add(SocketEvent.TIMEOUT);
Assert.assertEquals("The timeout should have been dispatched again",
- List.of(SocketEvent.TIMEOUT, SocketEvent.TIMEOUT), processor.getDispatchedEvents());
+ timeoutsList, processor.getDispatchedEvents());
// Processing the event removes the timeout and marks the generation as handled, so any event that is already
// queued for it is ignored.
@@ -80,7 +85,7 @@ public class TestAbstractProcessorAsyncTimeout {
processor.timeoutAsync(asyncStart + 6000);
Assert.assertEquals("The timeout must not be dispatched once it has been processed",
- List.of(SocketEvent.TIMEOUT, SocketEvent.TIMEOUT), processor.getDispatchedEvents());
+ timeoutsList, processor.getDispatchedEvents());
}
private static class TestProcessor extends Http11Processor {
diff --git a/test/org/apache/coyote/TestRequest.java b/test/org/apache/coyote/TestRequest.java
index 40007cef94..7584097349 100644
--- a/test/org/apache/coyote/TestRequest.java
+++ b/test/org/apache/coyote/TestRequest.java
@@ -19,6 +19,7 @@ package org.apache.coyote;
import java.io.IOException;
import java.nio.ByteBuffer;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org