luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3830 from dwijnand/catch-DeserializationException 

Replace Throwable catching with DeserializationException catching
This commit is contained in:
eugene yokota 2017-12-20 10:22:21 -05:00 committed by GitHub
parent 34d311f9ce 6e09c660fe
commit 16244f9be6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
protocol/src/main/scala/sbt/internal/protocol/codec/JsonRpcRequestMessageFormats.scala
View File

@ -8,7 +8,7 @@
package sbt.internal.protocol.codec
import sjsonnew.shaded.scalajson.ast.unsafe.JValue
import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError }
import sjsonnew.{ Builder, DeserializationException, JsonFormat, Unbuilder, deserializationError }
trait JsonRpcRequestMessageFormats {
self: sbt.internal.util.codec.JValueFormats with sjsonnew.BasicJsonProtocol =>
@ -24,7 +24,7 @@ trait JsonRpcRequestMessageFormats {
val id = try {
unbuilder.readField[String]("id")
} catch {
case _: Throwable => unbuilder.readField[Long]("id").toString
case _: DeserializationException => unbuilder.readField[Long]("id").toString
}
val method = unbuilder.readField[String]("method")
val params = unbuilder.lookupField("params") map {

4
protocol/src/main/scala/sbt/internal/protocol/codec/JsonRpcResponseMessageFormats.scala
View File

@ -7,7 +7,7 @@
package sbt.internal.protocol.codec
import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError }
import sjsonnew.{ Builder, DeserializationException, JsonFormat, Unbuilder, deserializationError }
import sjsonnew.shaded.scalajson.ast.unsafe.JValue
trait JsonRpcResponseMessageFormats {
@ -27,7 +27,7 @@ trait JsonRpcResponseMessageFormats {
val id = try {
unbuilder.readField[Option[String]]("id")
} catch {
case _: Throwable => unbuilder.readField[Option[Long]]("id") map { _.toString }
case _: DeserializationException => unbuilder.readField[Option[Long]]("id") map { _.toString }
}
val result = unbuilder.lookupField("result") map {