From c40055cc1cfc2266f1f83d5d816eae0576e007e7 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Sun, 19 Feb 2012 22:41:26 -0500 Subject: [PATCH] cleanup, fix compilation --- tasks/standard/TaskExtra.scala | 2 +- util/process/ProcessImpl.scala | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tasks/standard/TaskExtra.scala b/tasks/standard/TaskExtra.scala index 5810a02f4..79f40e301 100644 --- a/tasks/standard/TaskExtra.scala +++ b/tasks/standard/TaskExtra.scala @@ -185,7 +185,7 @@ object TaskExtra extends TaskExtra def processIO(s: TaskStreams[_]): ProcessIO = { def transfer(id: String) = (in: InputStream) => BasicIO.transferFully(in, s.binary(id)) - new ProcessIO(BasicIO.ignoreOut, transfer(s.outID), transfer(s.errorID)) + new ProcessIO(BasicIO.closeOut, transfer(s.outID), transfer(s.errorID)) } def reduced[S](i: IndexedSeq[Task[S]], f: (S, S) => S): Task[S] = i match diff --git a/util/process/ProcessImpl.scala b/util/process/ProcessImpl.scala index f29d8bfa3..d14b64f78 100644 --- a/util/process/ProcessImpl.scala +++ b/util/process/ProcessImpl.scala @@ -51,6 +51,7 @@ object BasicIO private def processErrFully(log: ProcessLogger) = processFully(s => log.error(s)) private def processInfoFully(log: ProcessLogger) = processFully(s => log.info(s)) + def closeOut = (_: OutputStream).close() final val BufferSize = 8192 final val Newline = System.getProperty("line.separator") @@ -61,7 +62,7 @@ object BasicIO { val reader = new BufferedReader(new InputStreamReader(in)) processLinesFully(processLine)(reader.readLine) - reader.close() + reader.close() } def processLinesFully(processLine: String => Unit)(readLine: () => String) { @@ -77,10 +78,7 @@ object BasicIO readFully() } def connectToIn(o: OutputStream) { transferFully(Uncloseable protect System.in, o) } - def input(connect: Boolean): OutputStream => Unit = { outputToProcess => - if(connect) connectToIn(outputToProcess) - else outputToProcess.close() - } + def input(connect: Boolean): OutputStream => Unit = if(connect) connectToIn else closeOut def standard(connectInput: Boolean): ProcessIO = standard(input(connectInput)) def standard(in: OutputStream => Unit): ProcessIO = new ProcessIO(in, toStdOut, toStdErr) @@ -113,7 +111,7 @@ object BasicIO } } read - in.close() + in.close() } }