diff options
author | Derek Chen-Beker <dchenbecker@gmail.com> | 2008-05-10 01:55:02 +0000 |
---|---|---|
committer | Derek Chen-Beker <dchenbecker@gmail.com> | 2008-05-10 01:55:02 +0000 |
commit | bfe8a1281e7799ae72a8f03721c5b2831d8b266a (patch) | |
tree | 50566ba8e03875f3d79cb453b86f6f3e060725ee /src/library | |
parent | fa147c6ad993f81a81fed980dcc5f50dfbc12a46 (diff) | |
download | scala-bfe8a1281e7799ae72a8f03721c5b2831d8b266a.tar.gz scala-bfe8a1281e7799ae72a8f03721c5b2831d8b266a.tar.bz2 scala-bfe8a1281e7799ae72a8f03721c5b2831d8b266a.zip |
Fixed #873 by adding in a missing case to resol...
Fixed #873 by adding in a missing case to resolveType.
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/scala/util/parsing/json/JSON.scala | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/library/scala/util/parsing/json/JSON.scala b/src/library/scala/util/parsing/json/JSON.scala index 96d541b0f2..07f48a6061 100644 --- a/src/library/scala/util/parsing/json/JSON.scala +++ b/src/library/scala/util/parsing/json/JSON.scala @@ -50,13 +50,16 @@ object JSON extends Parser { * A utility method to resolve a parsed JSON list into objects or * arrays. See the parse method for details. */ - def resolveType(input: List[Any]): Any = { + def resolveType(input: List[_]): Any = { var objMap = Map[String, Any]() if (input.forall { case (key: String, value: List[_]) => objMap += (key -> resolveType(value)) true + case (key : String, value : Any) => + objMap += (key -> value) + true case _ => false }) objMap else |