Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Script: Load Whitelists as Resource #87539

Merged
merged 5 commits into from Jun 9, 2022
Merged

Script: Load Whitelists as Resource #87539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7869db0
Script: Load Whitelists as Resource
stu-elastic Jun 8, 2022
2c0387d
Update docs/changelog/87539.yaml
stu-elastic Jun 8, 2022
d9bdc23
Merge branch 'master' of github.com:elastic/elasticsearch into pain_c…
stu-elastic Jun 8, 2022
134f646
Merge branch 'pain_ctx_wl_stream' of github.com:stu-elastic/elasticse…
stu-elastic Jun 8, 2022
a2b4daf
Merge branch 'master' of github.com:elastic/elasticsearch into pain_c…
stu-elastic Jun 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/changelog/87539.yaml
View file
Open in desktop
@@ -0,0 +1,5 @@
pr: 87539
summary: "Script: Load Whitelists as Resource"
area: Infra/Scripting
type: bug
issues: []
2 changes: 1 addition & 1 deletion modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessPlugin.java
View file
Open in desktop
Expand Up @@ -90,7 +90,7 @@ public final class PainlessPlugin extends Plugin implements ScriptPlugin, Extens

for (ScriptContext<?> context : ScriptModule.CORE_CONTEXTS.values()) {
List<Whitelist> contextWhitelists = new ArrayList<>();
if (PainlessPlugin.class.getResourceAsStream("org.elasticsearch.script." + context.name.replace('-', '_') + ".txt") != null) {
if (PainlessPlugin.class.getResource("org.elasticsearch.script." + context.name.replace('-', '_') + ".txt") != null) {
contextWhitelists.add(
WhitelistLoader.loadFromResourceFiles(
PainlessPlugin.class,
Expand Down