From 8a73c25000330606be7c8f85cd91a8cc8bb3fd73 Mon Sep 17 00:00:00 2001
From: kohsuke <kohsuke@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Mon, 14 Sep 2009 23:52:25 +0000
Subject: [PATCH] Fixed the charset encoding handling when different encodings
 are involved between the master and slaves.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@21664 71c3de6d-444a-0410-be80-ed276b4c234a
---
 core/src/main/java/hudson/model/Run.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java
index 469e4dbfb6..ad20f44d0d 100644
--- a/core/src/main/java/hudson/model/Run.java
+++ b/core/src/main/java/hudson/model/Run.java
@@ -899,14 +899,16 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
     public Reader getLogReader() throws IOException {
     	File logFile = getLogFile();
     	if (logFile.exists() ) {
-    		return new FileReader(logFile);
+            if (charset==null)  return new FileReader(logFile); // fall back
+    		return new InputStreamReader(new FileInputStream(logFile),charset);
     	} 
 
     	File compressedLogFile = new File(logFile.getParentFile(), logFile.getName()+ ".gz");
     	if (compressedLogFile.exists()) {
-    		return new InputStreamReader(
-    				new GZIPInputStream(
-    						new FileInputStream(compressedLogFile)));
+            GZIPInputStream is = new GZIPInputStream(new FileInputStream(compressedLogFile));
+
+            if (charset==null)  return new InputStreamReader(is);
+            else                return new InputStreamReader(is,charset);
     	} 
     	
     	return null;