Skip to content
Snippets Groups Projects
Commit 77e9da1f authored by jerryshao's avatar jerryshao
Browse files

Change Exception to NoSuchElementException and minor style fix

parent 85024acd
No related branches found
No related tags found
No related merge requests found
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
package org.apache.spark.scheduler.cluster package org.apache.spark.scheduler.cluster
import java.io.{FileInputStream, InputStream} import java.io.{FileInputStream, InputStream}
import java.util.Properties import java.util.{NoSuchElementException, Properties}
import org.apache.spark.Logging import org.apache.spark.Logging
...@@ -65,15 +65,15 @@ private[spark] class FairSchedulableBuilder(val rootPool: Pool) ...@@ -65,15 +65,15 @@ private[spark] class FairSchedulableBuilder(val rootPool: Pool)
override def buildPools() { override def buildPools() {
var is: Option[InputStream] = None var is: Option[InputStream] = None
try { try {
is = Option{ is = Option {
schedulerAllocFile.map{ f => schedulerAllocFile.map { f =>
new FileInputStream(f) new FileInputStream(f)
}.getOrElse{ }.getOrElse {
getClass.getClassLoader.getResourceAsStream(DEFAULT_SCHEDULER_FILE) getClass.getClassLoader.getResourceAsStream(DEFAULT_SCHEDULER_FILE)
} }
} }
is.foreach{ i => buildFairSchedulerPool(i) } is.foreach { i => buildFairSchedulerPool(i) }
} finally { } finally {
is.foreach(_.close()) is.foreach(_.close())
} }
...@@ -106,7 +106,8 @@ private[spark] class FairSchedulableBuilder(val rootPool: Pool) ...@@ -106,7 +106,8 @@ private[spark] class FairSchedulableBuilder(val rootPool: Pool)
try { try {
schedulingMode = SchedulingMode.withName(xmlSchedulingMode) schedulingMode = SchedulingMode.withName(xmlSchedulingMode)
} catch { } catch {
case e: Exception => logWarning("Error xml schedulingMode, using default schedulingMode") case e: NoSuchElementException =>
logWarning("Error xml schedulingMode, using default schedulingMode")
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment