diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2013-12-10 00:45:48 +0100 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2013-12-10 00:56:26 +0100 |
commit | 006e2f2aadf5d15ff1b9b32f1b7e96960b778933 (patch) | |
tree | 9b15e2049fb10410aae1ec8606257e716fd4828d /src/library/scala/MatchError.scala | |
parent | 0c927046dc5df974e6c39187107cf3548825282b (diff) | |
download | scala-006e2f2aadf5d15ff1b9b32f1b7e96960b778933.tar.gz scala-006e2f2aadf5d15ff1b9b32f1b7e96960b778933.tar.bz2 scala-006e2f2aadf5d15ff1b9b32f1b7e96960b778933.zip |
SI-7912 Be defensive calling `toString` in `MatchError#getMessage`
Otherwise, objects with exception-throwing `toString` lead to a
cascading error far removed from the originally failed match.
Diffstat (limited to 'src/library/scala/MatchError.scala')
-rw-r--r-- | src/library/scala/MatchError.scala | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/library/scala/MatchError.scala b/src/library/scala/MatchError.scala index 6ba7e833d3..9965bb19b5 100644 --- a/src/library/scala/MatchError.scala +++ b/src/library/scala/MatchError.scala @@ -23,9 +23,15 @@ final class MatchError(obj: Any) extends RuntimeException { /** There's no reason we need to call toString eagerly, * so defer it until getMessage is called. */ - private lazy val objString = + private lazy val objString = { + def ofClass = "of class " + obj.getClass.getName if (obj == null) "null" - else obj.toString() + " (of class " + obj.getClass.getName + ")" + else try { + obj.toString() + " (" + ofClass + ")" + } catch { + case _: Throwable => "an instance " + ofClass + } + } override def getMessage() = objString } |