updated original fix from pull request codahale#42

artgon · Aug 7, 2012 · 4b24b52 · 4b24b52
1 parent 178e78d
commit 4b24b52
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>com.codahale</groupId>
     <artifactId>jerkson_2.9.1</artifactId>
-    <version>0.6.0-Matygo</version>
+    <version>0.6.1-Matygo</version>
     <name>Jerkson for Scala</name>
 
     <properties>

diff --git a/src/main/scala/com/codahale/jerkson/deser/CaseClassDeserializer.scala b/src/main/scala/com/codahale/jerkson/deser/CaseClassDeserializer.scala
@@ -62,10 +62,7 @@ class CaseClassDeserializer(config: DeserializationConfig,
         values += value
       } else {
         // see if a default value was supplied
-        paramDefault match {
-          case Some(v) => values += v
-          case None =>
-        }
+        paramDefault.foreach(values += _())
       }
 
 

diff --git a/src/main/scala/com/codahale/jerkson/util/CaseClassSigParser.scala b/src/main/scala/com/codahale/jerkson/util/CaseClassSigParser.scala
@@ -106,7 +106,7 @@ object CaseClassSigParser {
             catch {
               case _ => None // indicates no default value was supplied
             }
-            val defaultValue = defaultMethod.map(m => Some(m.invoke(companionObject))).getOrElse(None)
+            val defaultValue = defaultMethod.map(m => () => m.invoke(companionObject))
 
             Tuple3(ms.name, typeRef2JavaType(t, factory, classLoader), defaultValue) :: Nil
           }