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-5800 Jaspic Uses Unexported Package in 'java.base' Module #5470

Merged
merged 6 commits into from
Oct 27, 2021

Conversation

Pandrex247
Copy link
Member

Description

When using JDK 17 Payara Micro would throw an exception about java.base not exporting the sun.security.util package.
This PR brings in the changes made upstream in GlassFish, and adjusts it to fit in our code base: eclipse-ee4j/glassfish#23339

Important Info

Blockers

None

Testing

New tests

None

Testing Performed

Build the server (JDK 8)
Started Payara Micro and deployed reproducer app from Jira and poked the endpoint (JDK 17) - no error
Started Payara Micro and deployed reproducer app from Jira and poked the endpoint (JDK 8) - no error
Started Payara Micro and deployed reproducer app from Jira and poked the endpoint (JDK 11) - no error

Testing Environment

Windows 10.
Zulu JDK 8.0.312, 11.0.13, and 17.0.1

Documentation

N/A

Notes for Reviewers

Haven't poked the server past just loading the admin console, but no purple dancing elephants as to why this would break anything.

arjantijms and others added 3 commits October 25, 2021 17:08
Signed-off-by: arjantijms <arjan.tijms@gmail.com>
Signed-off-by: Andrew Pielage <andrew.pielage@payara.fish>
Signed-off-by: Andrew Pielage <andrew.pielage@payara.fish>
@Pandrex247
Copy link
Member Author

Jenkins test please

@Pandrex247 Pandrex247 requested a review from aubi October 25, 2021 16:38
}

// map id to Intercept
intEntry.idMap.put(id, idEntry);
}

private String expand(String rawProperty) {
Matcher propertyMatcher = PROPERTY_PATTERN.matcher(rawProperty);
StringBuffer propertyBuilder = new StringBuffer();
Copy link
Member Author

Choose a reason for hiding this comment

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

Was StringBuilder upstream, but Matcher.appendReplacement uses StringBuffer in JDK8.

Copy link
Contributor

Choose a reason for hiding this comment

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

StringBuffer is synchronized, e.g. necessarily slower if not used among threads.

Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
@Pandrex247
Copy link
Member Author

Jenkins test please

Copy link
Contributor

@aubi aubi left a comment

Choose a reason for hiding this comment

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

LGTM

@Pandrex247 Pandrex247 merged commit aeaab6b into payara:master Oct 27, 2021
JamesHillyard pushed a commit to JamesHillyard/Payara that referenced this pull request Nov 18, 2021
FISH-5800 Jaspic Uses Unexported Package in 'java.base' Module
@Pandrex247 Pandrex247 deleted the FISH-5800 branch March 29, 2022 14:18
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