From 77e9da1f34a0b9e556d7c0bbd4aeaa5c635b881d Mon Sep 17 00:00:00 2001
From: jerryshao <saisai.shao@intel.com>
Date: Sun, 22 Sep 2013 16:50:08 +0800
Subject: [PATCH] Change Exception to NoSuchElementException and minor style
fix
---
.../scheduler/cluster/SchedulableBuilder.scala | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/core/src/main/scala/org/apache/spark/scheduler/cluster/SchedulableBuilder.scala b/core/src/main/scala/org/apache/spark/scheduler/cluster/SchedulableBuilder.scala
index 65b844a80e..114617c51a 100644
--- a/core/src/main/scala/org/apache/spark/scheduler/cluster/SchedulableBuilder.scala
+++ b/core/src/main/scala/org/apache/spark/scheduler/cluster/SchedulableBuilder.scala
@@ -18,7 +18,7 @@
package org.apache.spark.scheduler.cluster
import java.io.{FileInputStream, InputStream}
-import java.util.Properties
+import java.util.{NoSuchElementException, Properties}
import org.apache.spark.Logging
@@ -65,15 +65,15 @@ private[spark] class FairSchedulableBuilder(val rootPool: Pool)
override def buildPools() {
var is: Option[InputStream] = None
try {
- is = Option{
- schedulerAllocFile.map{ f =>
+ is = Option {
+ schedulerAllocFile.map { f =>
new FileInputStream(f)
- }.getOrElse{
+ }.getOrElse {
getClass.getClassLoader.getResourceAsStream(DEFAULT_SCHEDULER_FILE)
}
}
- is.foreach{ i => buildFairSchedulerPool(i) }
+ is.foreach { i => buildFairSchedulerPool(i) }
} finally {
is.foreach(_.close())
}
@@ -106,7 +106,8 @@ private[spark] class FairSchedulableBuilder(val rootPool: Pool)
try {
schedulingMode = SchedulingMode.withName(xmlSchedulingMode)
} catch {
- case e: Exception => logWarning("Error xml schedulingMode, using default schedulingMode")
+ case e: NoSuchElementException =>
+ logWarning("Error xml schedulingMode, using default schedulingMode")
}
}
--
GitLab