diff options
author | Johannes Rudolph <johannes.rudolph@gmail.com> | 2013-08-16 11:18:46 +0200 |
---|---|---|
committer | Johannes Rudolph <johannes.rudolph@gmail.com> | 2013-08-16 11:18:46 +0200 |
commit | 83237b4a640897a22e0800ee6609c1d309292a3b (patch) | |
tree | 062b885c20ca31d3ef9264e2400fb93d6e77b9e6 /src/main/scala | |
parent | e35d195b46a006f57121caaaabda1435f0cd4ef8 (diff) | |
parent | 3cd8cdc93aa1ad69703cafb0af8b801f1c93ecce (diff) | |
download | spray-json-83237b4a640897a22e0800ee6609c1d309292a3b.tar.gz spray-json-83237b4a640897a22e0800ee6609c1d309292a3b.tar.bz2 spray-json-83237b4a640897a22e0800ee6609c1d309292a3b.zip |
Merge commit 'pull/67'
Diffstat (limited to 'src/main/scala')
-rw-r--r-- | src/main/scala/spray/json/StandardFormats.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/scala/spray/json/StandardFormats.scala b/src/main/scala/spray/json/StandardFormats.scala index 6a9712a..d71dcae 100644 --- a/src/main/scala/spray/json/StandardFormats.scala +++ b/src/main/scala/spray/json/StandardFormats.scala @@ -106,7 +106,7 @@ trait StandardFormats { implicit def tuple7Format[A :JF, B :JF, C :JF, D :JF, E :JF, F: JF, G: JF] = { new RootJsonFormat[(A, B, C, D, E, F, G)] { - def write(t: (A, B, C, D, E, F, G)) = JsArray(t._1.toJson, t._2.toJson, t._3.toJson, t._4.toJson, t._5.toJson, t._6.toJson, t._6.toJson) + def write(t: (A, B, C, D, E, F, G)) = JsArray(t._1.toJson, t._2.toJson, t._3.toJson, t._4.toJson, t._5.toJson, t._6.toJson, t._7.toJson) def read(value: JsValue) = value match { case JsArray(a :: b :: c :: d :: e :: f :: g :: Nil) => (a.convertTo[A], b.convertTo[B], c.convertTo[C], d.convertTo[D], e.convertTo[E], f.convertTo[F], g.convertTo[G]) @@ -115,4 +115,4 @@ trait StandardFormats { } } -}
\ No newline at end of file +} |