Skip to content

Commit 4b24b52

Browse files
committed
updated original fix from pull request codahale#42
1 parent 178e78d commit 4b24b52

3 files changed

Lines changed: 3 additions & 6 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<groupId>com.codahale</groupId>
1212
<artifactId>jerkson_2.9.1</artifactId>
13-
<version>0.6.0-Matygo</version>
13+
<version>0.6.1-Matygo</version>
1414
<name>Jerkson for Scala</name>
1515

1616
<properties>

src/main/scala/com/codahale/jerkson/deser/CaseClassDeserializer.scala

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,7 @@ class CaseClassDeserializer(config: DeserializationConfig,
6262
values += value
6363
} else {
6464
// see if a default value was supplied
65-
paramDefault match {
66-
case Some(v) => values += v
67-
case None =>
68-
}
65+
paramDefault.foreach(values += _())
6966
}
7067

7168

src/main/scala/com/codahale/jerkson/util/CaseClassSigParser.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ object CaseClassSigParser {
106106
catch {
107107
case _ => None // indicates no default value was supplied
108108
}
109-
val defaultValue = defaultMethod.map(m => Some(m.invoke(companionObject))).getOrElse(None)
109+
val defaultValue = defaultMethod.map(m => () => m.invoke(companionObject))
110110

111111
Tuple3(ms.name, typeRef2JavaType(t, factory, classLoader), defaultValue) :: Nil
112112
}

0 commit comments

Comments
 (0)