From 6e09c660fe54ce674e6df26f1b423f1b6ef84990 Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Wed, 20 Dec 2017 11:50:02 +0000
Subject: [PATCH] Replace Throwable catching with DeserializationException
 catching

---
 .../protocol/codec/JsonRpcRequestMessageFormats.scala         | 4 ++--
 .../protocol/codec/JsonRpcResponseMessageFormats.scala        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/protocol/src/main/scala/sbt/internal/protocol/codec/JsonRpcRequestMessageFormats.scala b/protocol/src/main/scala/sbt/internal/protocol/codec/JsonRpcRequestMessageFormats.scala
index dac0987e4..e0e047cc6 100644
--- a/protocol/src/main/scala/sbt/internal/protocol/codec/JsonRpcRequestMessageFormats.scala
+++ b/protocol/src/main/scala/sbt/internal/protocol/codec/JsonRpcRequestMessageFormats.scala
@@ -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 {
diff --git a/protocol/src/main/scala/sbt/internal/protocol/codec/JsonRpcResponseMessageFormats.scala b/protocol/src/main/scala/sbt/internal/protocol/codec/JsonRpcResponseMessageFormats.scala
index d10164e67..56cec6321 100644
--- a/protocol/src/main/scala/sbt/internal/protocol/codec/JsonRpcResponseMessageFormats.scala
+++ b/protocol/src/main/scala/sbt/internal/protocol/codec/JsonRpcResponseMessageFormats.scala
@@ -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 {