Skip to content
Permalink
Browse files
8254802: ThrowingPushPromisesAsStringCustom.java fails in "try throwi…
…ng in GET_BODY"

Reviewed-by: michaelm
  • Loading branch information
dfuch committed Dec 7, 2020
1 parent f5a582c commit 566d77a2ae4ee8830c989ea03f7bc6923df061cd
Showing 1 changed file with 20 additions and 0 deletions.
@@ -723,6 +723,8 @@ void readLoop() {
}
//System.err.printf("TestServer: received frame %s\n", frame);
int stream = frame.streamid();
int next = nextstream;
int nextPush = nextPushStreamId;
if (stream == 0) {
if (frame.type() == WindowUpdateFrame.TYPE) {
WindowUpdateFrame wup = (WindowUpdateFrame) frame;
@@ -770,6 +772,16 @@ void readLoop() {
// but the continuation, even after a reset
// should be handle gracefully by the client
// anyway.
} else if (isClientStreamId(stream) && stream < next) {
// We may receive a reset on a client stream that has already
// been closed. Just ignore it.
System.err.println("TestServer: received ResetFrame on closed stream: " + stream);
System.err.println(frame);
} else if (isServerStreamId(stream) && stream < nextPush) {
// We may receive a reset on a push stream that has already
// been closed. Just ignore it.
System.err.println("TestServer: received ResetFrame on closed push stream: " + stream);
System.err.println(frame);
} else {
System.err.println("TestServer: Unexpected frame on: " + stream);
System.err.println(frame);
@@ -790,6 +802,14 @@ void readLoop() {
}
}

static boolean isClientStreamId(int streamid) {
return (streamid & 0x01) == 0x01;
}

static boolean isServerStreamId(int streamid) {
return (streamid & 0x01) == 0x00;
}

/** Encodes an group of headers, without any ordering guarantees. */
List<ByteBuffer> encodeHeaders(HttpHeaders headers) {
List<ByteBuffer> buffers = new LinkedList<>();

3 comments on commit 566d77a

@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented on 566d77a Dec 7, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on 566d77a Oct 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 566d77a Oct 5, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GoeLin the backport was successfully created on the branch GoeLin-backport-566d77a2 in my personal fork of openjdk/jdk11u-dev. To create a pull request with this backport targeting openjdk/jdk11u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

this pull request contains a backport of commit 566d77a2 from the openjdk/jdk repository.

The commit being backported was authored by Daniel Fuchs on 7 Dec 2020 and was reviewed by Michael McMahon.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk11u-dev:

$ git fetch https://github.com/openjdk-bots/jdk11u-dev GoeLin-backport-566d77a2:GoeLin-backport-566d77a2
$ git checkout GoeLin-backport-566d77a2
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk11u-dev GoeLin-backport-566d77a2

Please sign in to comment.