fix top resouces bug#3747
Open
conorschofield wants to merge 1 commit intoControlSystemStudio:masterfrom
Open
Conversation
|
Member
|
argh!!! I think ISIS had a similar issue which we fixed in the past. |
This file contains hidden or 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
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.



When a preference value contains a macro like
$(phoebus.install),$(phoebus.user), or$(user.home), thePropertyPreferenceLoaderapplies.replace("\\", "/").replace(" ", "%20")to make the resolved path URI-safe. However, these replacements were chained on the entire preference value rather than scoped to just the resolved path string.This caused two issues for multi-part preference values like
top_resources:"Ops Launcher"became"Ops%20Launcher"|delimiters became%20, prepending%20to URI schemes (e.g.,%20pv://,%20https://), causingnew URI(...)to throwURISyntaxExceptionand silently skip those entriesFor example, a
top_resourcesvalue with 11 entries would only display 4, with mangled names.Fix: Move the closing parenthesis so
.replace("\\", "/").replace(" ", "%20")applies to the resolved path string (Locations.install().toString()) rather than the fullvalue.replace(...)result.Checklist
Testing:
PropertyPreferenceLoaderTestadded with 8 test cases covering all three macros, multi-value preferences, Windows paths, and edge cases. Tests verified to pass on fixed code and fail on buggy code.Documentation: