Merge pull request #664 from Vlatombe/JENKINS-58789

[JENKINS-58789] Properly merge TaskListenerDecorator
jenkinsci · Dec 17, 2019 · ccdc295 · ccdc295
2 parents 33b9ee2 + fe96940
commit ccdc295
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/SecretsMasker.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/SecretsMasker.java
@@ -111,7 +111,7 @@ protected TaskListenerDecorator get(DelegatedContext context) throws IOException
                     Set<String> values = secrets.get(c);
                     if (values != null) {
                         LOGGER.log(Level.FINE, "Using cached secrets for {0}", c);
-                        return new SecretsMasker(values);
+                        return TaskListenerDecorator.merge(context.get(TaskListenerDecorator.class), new SecretsMasker(values));
                     } else {
                         LOGGER.log(Level.FINE, "Cached absence of secrets for {0}", c);
                         return null;