Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8266761: AssertionError in sun.net.httpserver.ServerImpl.responseCompleted #169

Closed

Conversation

@TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Jul 28, 2021

Backport of JDK-8266761. Applies cleanly except the following hunk:

--- src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java
+++ src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java
@@ -270,7 +269,6 @@ public void sendResponseHeaders (int rCode, long contentLen)
                     Optional.ofNullable(rspHdrs.get("Connection"))
                     .map(List::stream).orElse(Stream.empty());
             if (conheader.anyMatch("close"::equalsIgnoreCase)) {
-                Logger logger = server.getLogger();
                 logger.log (Level.DEBUG, "Connection: close requested by handler");
                 close = true;
             }

That code belongs to the enhancement JDK-8218554 which is not in 11u.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8266761: AssertionError in sun.net.httpserver.ServerImpl.responseCompleted

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/169/head:pull/169
$ git checkout pull/169

Update a local copy of the PR:
$ git checkout pull/169
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/169/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 169

View PR using the GUI difftool:
$ git pr show -t 169

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/169.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jul 28, 2021

👋 Welcome back mdoerr! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot changed the title Backport 2d2cd78bde7bb9101614a1ba2285d1e37d5d3249 8266761: AssertionError in sun.net.httpserver.ServerImpl.responseCompleted Jul 28, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jul 28, 2021

This backport pull request has now been updated with issue from the original commit.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Jul 28, 2021

Webrevs

Copy link
Member

@phohensee phohensee left a comment

Lgtm, except please put a comment about JDK-8218554 in ExchangeImpl.java at the point where JDK-8218554 applies. If JDK-8218554 is backported in the future, it's unlikely the engineer doing the backport will notice that this patch was done. No need for another review.

@openjdk
Copy link

@openjdk openjdk bot commented Aug 2, 2021

@TheRealMDoerr This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8266761: AssertionError in sun.net.httpserver.ServerImpl.responseCompleted

Reviewed-by: phh

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 7 new commits pushed to the master branch:

  • 05c7697: 8269668: [aarch64] java.library.path not including /usr/lib64
  • 37bc75b: 8241768: git needs .gitattributes
  • 351cb48: 8225583: Examine the HttpResponse.BodySubscribers for null handling and multiple subscriptions
  • 8ae2846: 8232243: Wrong caret position in JTextPane on Windows with a screen resolution > 100%
  • a2af649: 8268775: Password is being converted to String in AccessibleJPasswordField
  • 7639f8c: 8262470: Printed GlyphVector outline with low DPI has bad quality on Windows
  • 0e2d915: 8257620: Do not use objc_msgSend_stret to get macOS version

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Aug 2, 2021
@TheRealMDoerr
Copy link
Contributor Author

@TheRealMDoerr TheRealMDoerr commented Aug 3, 2021

Thanks for the review! Comment added.

@TheRealMDoerr
Copy link
Contributor Author

@TheRealMDoerr TheRealMDoerr commented Aug 4, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Aug 4, 2021

Going to push as commit cf2cf25.
Since your change was applied there have been 11 commits pushed to the master branch:

  • 0c783b0: 8257497: Update keytool to create AKID from the SKID of the issuing certificate as specified by RFC 5280
  • aebdee3: 8230674: Heap dumps should exclude dormant CDS archived objects of unloaded classes
  • 815d3e1: 8267625: AARCH64: typo in LIR_Assembler::emit_profile_type
  • 4da3fb8: 8268261: C2: assert(n != __null) failed: Bad immediate dominator info.
  • 05c7697: 8269668: [aarch64] java.library.path not including /usr/lib64
  • 37bc75b: 8241768: git needs .gitattributes
  • 351cb48: 8225583: Examine the HttpResponse.BodySubscribers for null handling and multiple subscriptions
  • 8ae2846: 8232243: Wrong caret position in JTextPane on Windows with a screen resolution > 100%
  • a2af649: 8268775: Password is being converted to String in AccessibleJPasswordField
  • 7639f8c: 8262470: Printed GlyphVector outline with low DPI has bad quality on Windows
  • ... and 1 more: https://git.openjdk.java.net/jdk11u-dev/compare/6e60332cbd9d45fe8be94d2b1a30accb99116c3d...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Aug 4, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Aug 4, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Aug 4, 2021

@TheRealMDoerr Pushed as commit cf2cf25.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@TheRealMDoerr TheRealMDoerr deleted the 8266761_httpserver branch Aug 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants