Move logic to correct function (oops)

apache · Sep 2, 2015 · bf324c4 · bf324c4
1 parent 0235a6a
commit bf324c4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/mllib/src/main/scala/org/apache/spark/ml/param/params.scala b/mllib/src/main/scala/org/apache/spark/ml/param/params.scala
@@ -461,7 +461,8 @@ trait Params extends Identifiable with Serializable {
    */
   final def getOrDefault[T](param: Param[T]): T = {
     shouldOwn(param)
-    get(param).orElse(getDefault(param)).get
+    get(param).orElse(getDefault(param)).getOrElse(
+      throw new NoSuchElementException(s"Failed to find a default value for ${param.name}"))
   }
 
   /** An alias for [[getOrDefault()]]. */
@@ -501,8 +502,7 @@ trait Params extends Identifiable with Serializable {
    */
   final def getDefault[T](param: Param[T]): Option[T] = {
     shouldOwn(param)
-    defaultParamMap.getOrElse(param,
-      throw new NoSuchElementException(s"Failed to find a default value for ${param.name}"))
+    defaultParamMap.get(param)
   }
 
   /**