Check closure before performing another one

losizm · Jul 19, 2020 · e647296 · e647296
1 parent 9feda79
commit e647296
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/main/scala/scamper/websocket/WebSocketSessionImpl.scala b/src/main/scala/scamper/websocket/WebSocketSessionImpl.scala
@@ -99,7 +99,7 @@ private[scamper] class WebSocketSessionImpl(val id: String, val target: Uri, val
       Try(doClose(statusCode.toData))
 
       try
-        if (statusCode != NoStatusReceived && statusCode != AbnormalClosure && statusCode != TlsHandshake)
+        if (!statusCode.reserved)
           conn.write(makeFrame(statusCode.toData, Close))
       catch {
         case err: Exception => if (!closeReceived.get) doError(err)
@@ -214,15 +214,11 @@ private[scamper] class WebSocketSessionImpl(val id: String, val target: Uri, val
       case _: SocketTimeoutException =>
         close(GoingAway)
 
-      case err: SocketException =>
+      case err =>
         if (!closeSent.get()) {
           doError(err)
           close(AbnormalClosure)
         }
-
-      case err =>
-        doError(err)
-        close(AbnormalClosure)
     }
 
   private def doText(data: Array[Byte], last: Boolean): Unit =