From b996a951576896c64e9fc9c371240a7727ac3acc Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Fri, 11 Mar 2011 16:52:12 -0500 Subject: [PATCH] cleanup --- run/Run.scala | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/run/Run.scala b/run/Run.scala index 60581374c..d92dd8538 100644 --- a/run/Run.scala +++ b/run/Run.scala @@ -18,10 +18,8 @@ class ForkRun(config: ForkScalaRun) extends ScalaRun def run(mainClass: String, classpath: Seq[File], options: Seq[String], log: Logger): Option[String] = { val scalaOptions = classpathOption(classpath) ::: mainClass :: options.toList - val exitCode = config.outputStrategy match { - case Some(strategy) => Fork.scala(config.javaHome, config.runJVMOptions, config.scalaJars, scalaOptions, config.workingDirectory, strategy) - case None => Fork.scala(config.javaHome, config.runJVMOptions, config.scalaJars, scalaOptions, config.workingDirectory, LoggedOutput(log)) - } + val strategy = config.outputStrategy getOrElse LoggedOutput(log) + val exitCode = Fork.scala(config.javaHome, config.runJVMOptions, config.scalaJars, scalaOptions, config.workingDirectory, strategy) processExitCode(exitCode, "runner") } private def classpathOption(classpath: Seq[File]) = "-cp" :: Path.makeString(classpath) :: Nil