Add single static instance of SpecialPermission#22726
Merged
Tim-Brooks merged 4 commits intoelastic:masterfrom Jan 21, 2017
Merged
Add single static instance of SpecialPermission#22726Tim-Brooks merged 4 commits intoelastic:masterfrom
Tim-Brooks merged 4 commits intoelastic:masterfrom
Conversation
jasontedor
approved these changes
Jan 20, 2017
Member
jasontedor
left a comment
There was a problem hiding this comment.
LGTM. I'm good with it, let's make sure @s1monw is before this is merged in.
rjernst
approved these changes
Jan 21, 2017
| final SecurityManager sm = System.getSecurityManager(); | ||
| if (sm != null) { | ||
| sm.checkPermission(new SpecialPermission()); | ||
| sm.checkPermission(SpecialPermission.INSTANCE); |
Member
There was a problem hiding this comment.
Can this be replaced with SpecialPermission.checkSpecialPermission()?
Contributor
Author
There was a problem hiding this comment.
Yes. It is slightly different in form which is why autorefactoring probably did not catch it.
| /** | ||
| * Check that the current stack has {@link SpecialPermission} access according to the {@link SecurityManager}. | ||
| */ | ||
| public static void checkSpecialPermission() { |
Member
There was a problem hiding this comment.
Maybe just call this method check() since it is used statically?
Contributor
Author
There was a problem hiding this comment.
Yeah. I added a committing changing that.
jasontedor
added a commit
to jasontedor/elasticsearch
that referenced
this pull request
Jan 23, 2017
* master: (33 commits) Docs fix - Added missing link to new Adjacency-matrix agg Pass `forceExecution` flag to transport interceptor (elastic#22739) Version: Add missing releases from 2.x in Version.java (elastic#22594) CONSOLE-ify filter aggregation docs CONSOLE-ify date_range aggregation docs Add single static instance of SpecialPermission (elastic#22726) Simplify InternalEngine#innerIndex (elastic#22721) Upgrade to Lucene 6.4.0 (elastic#22724) Fix broken TaskInfo.toString() Add CheckedSupplier and CheckedRunnable to core (elastic#22725) Revert "Make build Gradle 2.14 / 3.x compatible (elastic#22669)" Fixes retrieval of the latest snapshot index blob (elastic#22700) CONSOLE-ify date histogram docs CONSOLE-ify min and max aggregation docs CONSOLE-ify global-aggregation.asciidoc Fix script score function that combines _score and weight (elastic#22713) Corrected a plural verb to a singular one. (elastic#22681) Fix duplicates from search.query (elastic#22701) Readd unconverted snippets mark for doc Deguice rest handlers (elastic#22575) ...
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
4 participants
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 commit adds a SpecialPermission constant and uses that constant
opposed to introducing new instances everywhere.
Additionally, this commit introduces a single static method to check that
the current code has permission. This avoids all the duplicated access
blocks that exist currently.