diff --git a/data-node/src/main/java/org/graylog/datanode/management/Environment.java b/data-node/src/main/java/org/graylog/datanode/management/Environment.java index 361e98f4a7..7a67ecf638 100644 --- a/data-node/src/main/java/org/graylog/datanode/management/Environment.java +++ b/data-node/src/main/java/org/graylog/datanode/management/Environment.java @@ -41,7 +41,7 @@ public class Environment { public Map getEnv() { Map env = new HashMap<>(); - env.putAll(cleanEnvironment(env)); + env.putAll(cleanEnvironment(this.env)); env.putAll(additionalVariables); return Collections.unmodifiableMap(env); } diff --git a/data-node/src/test/java/org/graylog/datanode/management/EnvironmentTest.java b/data-node/src/test/java/org/graylog/datanode/management/EnvironmentTest.java index 11ff2f5829..59d821ff22 100644 --- a/data-node/src/test/java/org/graylog/datanode/management/EnvironmentTest.java +++ b/data-node/src/test/java/org/graylog/datanode/management/EnvironmentTest.java @@ -29,6 +29,7 @@ class EnvironmentTest { void testFiltering() { final Environment env = new Environment(Map.of("USER", "test", "JAVA_HOME", "/path/to/jre")); Assertions.assertThat(env.getEnv()) - .doesNotContainKey("JAVA_HOME"); + .doesNotContainKey("JAVA_HOME") + .containsKey("USER"); } }