Merge pull request #4684 from janekdb/2.11.x-unit-return-in-map

SethTisue · SethTisue · commit 0c4d806b89b7 · 2015-08-06T14:38:02.000-07:00
Stop mapping to Unit when executing finally code.
diff --git a/src/library/scala/util/control/Exception.scala b/src/library/scala/util/control/Exception.scala
@@ -105,7 +105,7 @@ object Exception {
         case x if rethrow(x)        => throw x
         case x if pf isDefinedAt x  => pf(x)
       }
-      finally fin map (_.invoke())
+      finally fin foreach (_.invoke())
 
     /* Create an empty Try container with this Catch and the supplied `Finally`. */
     def andFinally(body: => Unit): Catch[T] = fin match {

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ object Exception {`
`105`	`105`	`case x if rethrow(x) => throw x`
`106`	`106`	`case x if pf isDefinedAt x => pf(x)`
`107`	`107`	`}`
`108`		`- finally fin map (_.invoke())`
	`108`	`+ finally fin foreach (_.invoke())`
`109`	`109`
`110`	`110`	/* Create an empty Try container with this Catch and the supplied `Finally`. */
`111`	`111`	`def andFinally(body: => Unit): Catch[T] = fin match {`