From 617896adc0784b933f035a9a9dfb6e96ccb6340b Mon Sep 17 00:00:00 2001 From: Stuart Tettemer Date: Thu, 9 Jun 2022 09:55:14 -0500 Subject: [PATCH] Script: Load Whitelists as Resource (#87539) Changes PainlessPlugin.class.getResourceAsStream to PainlessPlugin.class.getResource to avoid leaking unclosed input streams --- docs/changelog/87539.yaml | 5 +++++ .../main/java/org/elasticsearch/painless/PainlessPlugin.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 docs/changelog/87539.yaml diff --git a/docs/changelog/87539.yaml b/docs/changelog/87539.yaml new file mode 100644 index 0000000000000..617e3e0969b31 --- /dev/null +++ b/docs/changelog/87539.yaml @@ -0,0 +1,5 @@ +pr: 87539 +summary: "Script: Load Whitelists as Resource" +area: Infra/Scripting +type: bug +issues: [] diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessPlugin.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessPlugin.java index 94e4a08084e39..ea73f3c318d66 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessPlugin.java +++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessPlugin.java @@ -90,7 +90,7 @@ public final class PainlessPlugin extends Plugin implements ScriptPlugin, Extens for (ScriptContext context : ScriptModule.CORE_CONTEXTS.values()) { List 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,