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

8266820: micro java/nio/SelectorWakeup.java has wrong copyright header #3952

Closed
wants to merge 3 commits into from

Conversation

bplb
Copy link
Member

@bplb bplb commented May 10, 2021

Please review this correction of a copyright header. Thanks.


Progress

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

Issue

  • JDK-8266820: micro java/nio/SelectorWakeup.java has wrong copyright header

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/3952/head:pull/3952
$ git checkout pull/3952

Update a local copy of the PR:
$ git checkout pull/3952
$ git pull https://git.openjdk.java.net/jdk pull/3952/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3952

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/3952.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented May 10, 2021

👋 Welcome back bpb! 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
Copy link

@openjdk openjdk bot commented May 10, 2021

@bplb this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout SelectorWakeup-copyright-8266820
git fetch https://git.openjdk.java.net/jdk master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added merge-conflict rfr labels May 10, 2021
@openjdk
Copy link

@openjdk openjdk bot commented May 10, 2021

@bplb The following label will be automatically applied to this pull request:

  • nio

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the nio label May 10, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented May 10, 2021

Webrevs

@openjdk openjdk bot removed the merge-conflict label May 10, 2021
@@ -1,32 +1,24 @@
/*
Copy link
Contributor

@AlanBateman AlanBateman May 10, 2021

Choose a reason for hiding this comment

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

is your repo up to date? This micro is in the channels directory.

Copy link
Member Author

@bplb bplb May 10, 2021

Choose a reason for hiding this comment

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

Copy link
Member Author

@bplb bplb May 10, 2021

Choose a reason for hiding this comment

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

It was not initially up to date but I merged. I think you were looking at a prior commit.

Copy link
Contributor

@AlanBateman AlanBateman May 10, 2021

Choose a reason for hiding this comment

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

Maybe the bot has fixed the merge conflict. 00-Full suggests you changed the file in the old location, 00-Full suggests you changed the correct file.

Copy link
Member Author

@bplb bplb May 10, 2021

Choose a reason for hiding this comment

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

The manual merge fixed it.

@openjdk
Copy link

@openjdk openjdk bot commented May 10, 2021

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

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

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

8266820: micro java/nio/SelectorWakeup.java has wrong copyright header

Reviewed-by: chegar, alanb, michaelm, iris

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 20 new commits pushed to the master branch:

  • 2d2cd78: 8266761: AssertionError in sun.net.httpserver.ServerImpl.responseCompleted
  • 9c9c47e: 8266813: Shenandoah: Use shorter instruction sequence for checking if marking in progress
  • 0344e75: 8266794: Remove dead code notify_allocation_jvmti_allocation_event
  • 9e6e222: 8266892: avoid maybe-uninitialized gcc warnings on linux s390x
  • 6575566: 8266787: Potential overflow of pointer arithmetic in G1ArchiveAllocator
  • 8468001: 8263452: Javac slow compilation due to algorithmic complexity
  • 67cb22a: 8266601: Fix bugs in AddLNode::Ideal transformations
  • 18e9d28: 8266676: G1: Remove dead code init_node_id_to_index_map()
  • 0e7bdae: 8265062: Remove duplication constant MaxTextureSize
  • 10a049e: 8265956: JVM crashes when matching LShiftVB Node
  • ... and 10 more: https://git.openjdk.java.net/jdk/compare/5d761fcffd6eea1c5be35d2ddec1479eccb85750...master

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 May 10, 2021
@bplb
Copy link
Member Author

@bplb bplb commented May 11, 2021

/integrate

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

@openjdk openjdk bot commented May 11, 2021

@bplb Since your change was applied there have been 22 commits pushed to the master branch:

  • d0daa72: 8266857: PipedOutputStream.sink should be volatile
  • 381de0c: 8266753: jdk/test/lib/process/ProcTest.java failed with "Exception: Proc abnormal end"
  • 2d2cd78: 8266761: AssertionError in sun.net.httpserver.ServerImpl.responseCompleted
  • 9c9c47e: 8266813: Shenandoah: Use shorter instruction sequence for checking if marking in progress
  • 0344e75: 8266794: Remove dead code notify_allocation_jvmti_allocation_event
  • 9e6e222: 8266892: avoid maybe-uninitialized gcc warnings on linux s390x
  • 6575566: 8266787: Potential overflow of pointer arithmetic in G1ArchiveAllocator
  • 8468001: 8263452: Javac slow compilation due to algorithmic complexity
  • 67cb22a: 8266601: Fix bugs in AddLNode::Ideal transformations
  • 18e9d28: 8266676: G1: Remove dead code init_node_id_to_index_map()
  • ... and 12 more: https://git.openjdk.java.net/jdk/compare/5d761fcffd6eea1c5be35d2ddec1479eccb85750...master

Your commit was automatically rebased without conflicts.

Pushed as commit 7a0a57c.

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

@bplb bplb deleted the SelectorWakeup-copyright-8266820 branch Jun 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated nio
5 participants