luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ignore "java -version" IOException when launching servers 

process.start and reading from the stderr stream could in
theory throw IOException, we want to return None then
rather than crashing.
This commit is contained in:
Havoc Pennington 2014-08-15 15:20:50 -04:00
parent 3a065dc047
commit 081f6bac07
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
launch/src/main/scala/xsbt/boot/ServerApplication.scala
View File

@ -209,7 +209,7 @@ object ServerLauncher {
}
// None = couldn't figure it out
def javaIsAbove(currentDirectory: File, version: Int): Option[Boolean] = {
def javaIsAbove(currentDirectory: File, version: Int): Option[Boolean] = try {
val pb = new java.lang.ProcessBuilder()
// hopefully "java -version" is a lot faster than booting the full JVM.
// not sure how else we can do this.
@ -231,6 +231,11 @@ object ServerLauncher {
process.destroy()
try { process.waitFor() } catch { case NonFatal(_) => }
}
} catch {
case e: IOException =>
// both process.start and reading the output streams can throw IOException.
// all OS exceptions from process.start are supposed to be IOException.
None
}
def serverJvmArgs(currentDirectory: File, serverConfig: ServerConfiguration): List[String] =