Skip to content

Commit 2ac844b

Browse files
committed
8292381: java/net/httpclient/SpecialHeadersTest.java fails with "ERROR: Shutting down connection: HTTP/2 client stopped"
Backport-of: 256b52387b7267c234f03aac19422e59a77d956f
1 parent 80d12cc commit 2ac844b

File tree

2 files changed

+347
-124
lines changed

2 files changed

+347
-124
lines changed

test/jdk/java/net/httpclient/HttpServerAdapters.java

+19
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import java.util.List;
4646
import java.util.ListIterator;
4747
import java.util.Map;
48+
import java.util.Objects;
4849
import java.util.Optional;
4950
import java.util.Set;
5051
import java.util.concurrent.CopyOnWriteArrayList;
@@ -105,6 +106,16 @@ public static abstract class HttpTestRequestHeaders {
105106
public abstract Set<Map.Entry<String, List<String>>> entrySet();
106107
public abstract List<String> get(String name);
107108
public abstract boolean containsKey(String name);
109+
@Override
110+
public boolean equals(Object o) {
111+
if (this == o) return true;
112+
if (!(o instanceof HttpTestRequestHeaders other)) return false;
113+
return Objects.equals(entrySet(), other.entrySet());
114+
}
115+
@Override
116+
public int hashCode() {
117+
return Objects.hashCode(entrySet());
118+
}
108119

109120
public static HttpTestRequestHeaders of(Headers headers) {
110121
return new Http1TestRequestHeaders(headers);
@@ -138,6 +149,10 @@ public List<String> get(String name) {
138149
public boolean containsKey(String name) {
139150
return headers.containsKey(name);
140151
}
152+
@Override
153+
public String toString() {
154+
return String.valueOf(headers);
155+
}
141156
}
142157
private static final class Http2TestRequestHeaders extends HttpTestRequestHeaders {
143158
private final HttpHeaders headers;
@@ -160,6 +175,10 @@ public List<String> get(String name) {
160175
public boolean containsKey(String name) {
161176
return headers.firstValue(name).isPresent();
162177
}
178+
@Override
179+
public String toString() {
180+
return String.valueOf(headers);
181+
}
163182
}
164183
}
165184

0 commit comments

Comments
 (0)