Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion core/src/main/scala/org/apache/spark/util/Utils.scala
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import java.util.concurrent.{ConcurrentHashMap, Executors, ThreadPoolExecutor}
import scala.collection.JavaConversions._
import scala.collection.Map
import scala.collection.mutable.ArrayBuffer
import scala.io.Source
import scala.io.{Codec, Source}
import scala.reflect.ClassTag

import com.google.common.io.Files
Expand Down Expand Up @@ -644,6 +644,11 @@ private[spark] object Utils extends Logging {
for ((key, value) <- extraEnvironment) {
environment.put(key, value)
}
implicit val codec = if (System.getProperty("os.name").startsWith("Windows")) {
Codec.ISO8859
} else {
Codec.UTF8
}
val process = builder.start()
new Thread("read stderr for " + command(0)) {
override def run() {
Expand Down