Apply suggestions from code review

Co-authored-by: Jesse Glick <jglick@cloudbees.com>
jenkinsci · Jan 5, 2024 · 7ffdb69 · 7ffdb69
1 parent 6daee4a
commit 7ffdb69
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/durabletask/BourneShellScript.java b/src/main/java/org/jenkinsci/plugins/durabletask/BourneShellScript.java
@@ -283,7 +283,7 @@ private List<String> scriptLauncherCmd(ShellController c, FilePath ws, @CheckFor
         private ShellController(FilePath ws, boolean zOsFlag, @NonNull String cookieValue, String jenkinsResultTxtEncoding) throws IOException, InterruptedException {
             super(ws, cookieValue);
             this.isZos = zOsFlag;
-            this.jenkinsResultTxtEncoding = jenkinsResultTxtEncoding == null ? getCharset() : jenkinsResultTxtEncoding;
+            this.jenkinsResultTxtEncoding = jenkinsResultTxtEncoding;
         }
 
         public FilePath getScriptFile(FilePath ws) throws IOException, InterruptedException {
@@ -300,7 +300,7 @@ private FilePath pidFile(FilePath ws) throws IOException, InterruptedException {
             if(isZos) {
                 // We need to transcode status file from EBCDIC only on z/OS platform
                 FilePath statusFile = getResultFile(workspace);
-                status = statusFile.act(new StatusCheckWithEncoding(jenkinsResultTxtEncoding));
+                status = statusFile.act(new StatusCheckWithEncoding(jenkinsResultTxtEncoding != null ? jenkinsResultTxtEncoding : getCharset()));
             }
             else {
                 status = super.exitStatus(workspace, listener);