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

Don't combine resources from the two classloaders in KnotClassLoader.getResources #747

Merged
merged 1 commit into from
Dec 20, 2022

Conversation

modmuss50
Copy link
Member

This fixes the Configuration conflict: there is more than one oshi.architecture.properties file on the classpath warning seen in the log file.

I am not 100% sure this fix is correct? Maybe it should de-dupe the resources from the 2 classloaders?

@modmuss50 modmuss50 added the bug label Dec 16, 2022
@modmuss50 modmuss50 requested a review from sfPlayer1 December 16, 2022 19:00
Copy link
Contributor

@sfPlayer1 sfPlayer1 left a comment

Choose a reason for hiding this comment

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

Should be fine, the original CL isn't supposed to yield anything outside loader.

@modmuss50 modmuss50 merged commit 97b8445 into FabricMC:master Dec 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants