Browse files

Merge conflict

  • Loading branch information...
1 parent a508290 commit 53044d70647e971c251ef36371f40f822d87bac1 Joni Freeman committed Mar 22, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 core/json/src/main/scala/net/liftweb/json/Extraction.scala
View
2 core/json/src/main/scala/net/liftweb/json/Extraction.scala
@@ -179,7 +179,7 @@ object Extraction {
private def extract0(json: JValue, clazz: Class[_], typeArgs: Seq[Class[_]])
(implicit formats: Formats): Any = {
val mapping =
- if (clazz == classOf[List[_]] || clazz == classOf[Set[_]] || mf.erasure.isArray)
+ if (clazz == classOf[List[_]] || clazz == classOf[Set[_]] || clazz.isArray)
Col(clazz, mappingOf(typeArgs(0)))
else if (clazz == classOf[Map[_, _]])
Dict(mappingOf(typeArgs(1)))

0 comments on commit 53044d7

Please sign in to comment.