Forward-port PR#70 from 3.1.x to 3.2.x (cherry-pick) #85
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
…L_3_1B2 Proposed minor cleanup change to 3.1.x branch (cherry picked from commit 7d417f0) # Conflicts: # src/main/java/ognl/OgnlRuntime.java Kept checkPermission element from cherry-pick, even though it is related to ongoing SecurityManager logic changes in 3.1.x. Modified the lower block that was in conflict to use checkPermission instead of a redundant Map get, and provided a TODO comment for it to be removed if/when the SecurityManager logic from 3.1.x is merged into 3.2.x.
|
Hello OGNL Team. This is one of two PRs that I was able to cherry-pick independently from 3.1.x back to the 3.2.x branch without significant issues. I tried looking at the three (3) PR# 69,74,75 set from 3.1.x, but found seem too intertwined to deal with separately (I tried the simplest - 75 - and had issues). Those PRs should probably be dealt with in a single PR for 3.2.x (either as a sequence of in-order cherry-picks together or a manual migration of their code) ... once the Lukasz and Yasser might have a different preference on how to tackle that work ... |
|
I'm good with applying all the three at once, thank you :) |
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.
Forward-port PR#70 from 3.1.x to 3.2.x (cherry-pick).
Merge pull request #70 from JCgH4164838Gh792C124B5/localOGNL_3_1B2
Proposed minor cleanup change to 3.1.x branch
(cherry picked from commit 7d417f0)
Conflicts:
src/main/java/ognl/OgnlRuntime.java
Kept
checkPermissionelement from cherry-pick, even though it is related toongoing
SecurityManagerlogic changes in 3.1.x.Modified the lower block that was in conflict to use
checkPermissioninstead of a redundant Map get, and provided a TODO comment for it to be
removed if/when the
SecurityManagerlogic from 3.1.x is merged into 3.2.x.