From 05ae9aeb31d1e3b664b05d5c0e18e9e1a64838da Mon Sep 17 00:00:00 2001 From: Daniel Trebbien Date: Tue, 9 Jan 2018 16:12:11 -0800 Subject: [PATCH] Assume queueFile is UTF-8-encoded This is a follow-up to PR 3210 on GitHub. See: https://github.com/jenkinsci/jenkins/pull/3210#discussion_r160149671 --- core/src/main/java/hudson/model/Queue.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java index 6ad10d5f818e..7348f8b64568 100644 --- a/core/src/main/java/hudson/model/Queue.java +++ b/core/src/main/java/hudson/model/Queue.java @@ -76,7 +76,7 @@ import java.io.File; import java.io.IOException; import java.lang.ref.WeakReference; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; @@ -376,7 +376,7 @@ public void load() { // first try the old format File queueFile = getQueueFile(); if (queueFile.exists()) { - try (BufferedReader in = Files.newBufferedReader(Util.fileToPath(queueFile), Charset.defaultCharset())) { + try (BufferedReader in = Files.newBufferedReader(Util.fileToPath(queueFile), StandardCharsets.UTF_8)) { String line; while ((line = in.readLine()) != null) { AbstractProject j = Jenkins.getInstance().getItemByFullName(line, AbstractProject.class);