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

FISH-5693 Updated multiple keystore delimiter to be OS dependent #5395

Merged
merged 1 commit into from
Sep 1, 2021

Conversation

JamesHillyard
Copy link
Member

@JamesHillyard JamesHillyard commented Aug 31, 2021

Description

This is a bugfix for FISH-1342 which introduced the ability to specify multiple keystores, however this didn't work on Windows due to the delimiter being ':'.

This has been changed to use File.pathSeparator which is OS dependent meaning the delimiter is still ':' for Linux but ';' for Windows, allowing this feature to work. Changes have also been made to the keystore path for MultipleKeystoresConfigurationTest meaning SecureCustomHttpListenerTest now passes on Windows.

The same delimiter changes have been made to FISH-5639 so this displays the keystores correctly on Windows.

Important Info

Testing

Testing Performed

Manually tested the feature works on windows. Tested the Multiple Keystores test in Payara Samples ensuring it passes and works correctly on windows. Manually tested FISH-5639 produces the expected behaviour with these changes.

Ensured multiple keystores still works on Linux.

Testing Environment

Windows 10 Pro, Maven 3.6.3, JDK8

Documentation

Documentation PR: payara/Payara-Community-Documentation#241

@JamesHillyard
Copy link
Member Author

Jenkins test please

Copy link

@rdebusscher rdebusscher left a comment

Choose a reason for hiding this comment

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

LGTM

@JamesHillyard JamesHillyard merged commit 4b7717c into payara:master Sep 1, 2021
@JamesHillyard JamesHillyard deleted the FISH-5693 branch September 1, 2021 08:32
JamesHillyard added a commit to JamesHillyard/Payara that referenced this pull request Sep 17, 2021
FISH-5693 Updated multiple keystore delimiter to be OS dependent
JamesHillyard added a commit to JamesHillyard/Payara that referenced this pull request Oct 28, 2021
FISH-5693 Updated multiple keystore delimiter to be OS dependent
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants