Skip to content

Commit

Permalink
8322772: Clean up code after JDK-8322417
Browse files Browse the repository at this point in the history 
Reviewed-by: mbaesken
Backport-of: 32d80e2caf6063b58128bd5f3dc87b276f3bd0cb
  • Loading branch information
@RealCLanger
RealCLanger committed Dec 31, 2023
1 parent 98fb425 commit 24b3b2b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/java.base/share/classes/jdk/internal/io/JdkConsoleImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public char[] readPassword(String fmt, Object ... args) {
ioe.addSuppressed(x);
}
if (ioe != null) {
java.util.Arrays.fill(passwd, ' ');
Arrays.fill(passwd, ' ');
try {
if (reader instanceof LineReader lr) {
lr.zeroOut();
Expand Down

3 comments on commit 24b3b2b

@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

@RealCLanger
Copy link
Contributor Author

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 24b3b2b Dec 31, 2023

Choose a reason for hiding this comment

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

@RealCLanger Could not automatically backport 24b3b2b6 to openjdk/jdk17u-dev due to conflicts in the following files:

  • src/java.base/share/classes/jdk/internal/io/JdkConsoleImpl.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.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-RealCLanger-24b3b2b6

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk21u-dev.git 24b3b2b66f0bed3e9812999a5b6d511f31e9ad1f

# Backport the commit
$ git cherry-pick --no-commit 24b3b2b66f0bed3e9812999a5b6d511f31e9ad1f
# Resolve conflicts now

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

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

Please sign in to comment.