Fixed interfering tests in MP config. #2714
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
ljnelson
previously approved these changes
Feb 1, 2021
Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
danielkec
reviewed
Feb 8, 2021
Comment on lines
+179
to
+192
| if (config instanceof ConfigDelegate) { | ||
| for (Map.Entry<ClassLoader, ConfigDelegate> entry : CONFIGS.entrySet()) { | ||
| if (config == entry.getValue()) { | ||
| cl.set(entry.getKey()); | ||
| break; | ||
| } | ||
| } | ||
| } else { | ||
| for (Map.Entry<ClassLoader, ConfigDelegate> entry : CONFIGS.entrySet()) { | ||
| Config configFromRef = entry.getValue().delegate(); | ||
| if (config == configFromRef) { | ||
| cl.set(entry.getKey()); | ||
| break; | ||
| } |
There was a problem hiding this comment.
Maybe something like this could avoid code duplication
Predicate<Map.Entry<ClassLoader, ConfigDelegate>> entryPredicate;
if(config instanceof ConfigDelegate){
entryPredicate = entry -> config == entry.getValue();
}else {
entryPredicate = entry -> config == entry.getValue().delegate();
}
CONFIGS.entrySet()
.stream()
.filter(entryPredicate)
.findFirst()
.map(Map.Entry::getKey)
.ifPresent(cl::set);There was a problem hiding this comment.
On the other hand it's not shorter nor more readable and definitely not faster
danielkec
approved these changes
Feb 8, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #2647
releaseConfigdid not correctly take into account usage ofConfigDelegate.ObjectMappingTestdid not correctly handle release of configuration.finaldeclarations in testSigned-off-by: Tomas Langer tomas.langer@oracle.com