Skip to content

Commit

Permalink
8292682: Code change of JDK-8282730 not updated to reflect CSR update
Browse files Browse the repository at this point in the history 
Reviewed-by: xuelei, hchao
  • Loading branch information
@wangweij
wangweij committed Aug 19, 2022
1 parent 57aac2a commit 74d3330
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/java.base/share/classes/javax/security/auth/spi/LoginModule.java
View file
Expand Up @@ -225,7 +225,7 @@ void initialize(Subject subject, CallbackHandler callbackHandler,
* @return {@code true} if this method succeeded, or {@code false}
* if this {@code LoginModule} should be ignored.
*
* @implSpec Implementations should check if a variable is {@code null}
* @implNote Implementations should check if a variable is {@code null}
* before removing it from the Principals or Credentials set
* of a {@code Subject}, otherwise a {@code NullPointerException}
* will be thrown as these sets {@linkplain Subject#Subject()
Expand Down

3 comments on commit 74d3330

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Review

Issues

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on 74d3330 Oct 13, 2022

Choose a reason for hiding this comment

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

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 74d3330 Oct 13, 2022

Choose a reason for hiding this comment

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

@GoeLin Could not automatically backport 74d3330e to openjdk/jdk17u-dev due to conflicts in the following files:

  • src/java.base/share/classes/javax/security/auth/spi/LoginModule.java

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk17u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk17u-dev master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b GoeLin-backport-74d3330e

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk 74d3330e106f2f920bf264356e4f25f8f6c11580

# Backport the commit
$ git cherry-pick --no-commit 74d3330e106f2f920bf264356e4f25f8f6c11580
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 74d3330e106f2f920bf264356e4f25f8f6c11580'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk17u-dev with the title Backport 74d3330e106f2f920bf264356e4f25f8f6c11580.

Please sign in to comment.