CUSTOM-142 Delete JVM options with min max versions. #4409
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
Cousjava
approved these changes
Jan 8, 2020
dmatej
approved these changes
Jan 9, 2020
| @@ -162,7 +162,8 @@ private void deleteX(final JvmOptionBag bag, final List<String> toRemove, final | |||
| SingleConfigCode<JvmOptionBag> scc = (JvmOptionBag bag1) -> { | |||
| List<String> jvmopts = new ArrayList<>(bag1.getJvmRawOptions()); | |||
| int orig = jvmopts.size(); | |||
| boolean removed = jvmopts.removeIf(option -> toRemove.contains(new JvmOption(option).option)); | |||
| // using new JvmOption(option).toString() (instead op option directly) to make sure the correct formatting is applied. | |||
| boolean removed = jvmopts.removeIf(option -> toRemove.contains(new JvmOption(option).toString())); | |||
There was a problem hiding this comment.
This method has expectations ... it expects that formatting is done in option.toString() and it's result will be same as strings in bag1.getJvmRawOptions().
Seems fragile to me,
getJvmRawOptions does not have javadoc, but it looks it is the content of the XML element.
JvmOption.toString prints also minVersion and maxVersion, seems it is really symetric at this moment ... ok.
|
Jenkins test please |
dmatej
changed the title
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.
This is a bug fix
When you try to delete a JVM option which has defined a min and/or max version, the option cannot be found (and thus not deleted).
This PR fixes the delete logic of the JVM Options.
Important Info
No Unit Test created due to proxy requirements of JavaConfig within
org.jvnet.hk2.config.ConfigSupport#apply(org.jvnet.hk2.config.SingleConfigCode<T>, T)Testing
Testing Performed
./asadmin start-domain
./asadmin create-jvm-options '[1.8.123|1.8.231]-DtestOption'
./asadmin delete-jvm-options '[1.8.123|1.8.231]-DtestOption'
Testing Environment
Maven 3.5.4
JDK 1.8u181