From 364d873eba9b53f1a973cba4851a2837a1f89273 Mon Sep 17 00:00:00 2001 From: Mygod Date: Tue, 16 Aug 2016 20:51:47 +0800 Subject: [PATCH] Update to AutoCloseable in Java 1.7 --- src/main/scala/com/github/shadowsocks/utils/CloseUtils.scala | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/scala/com/github/shadowsocks/utils/CloseUtils.scala b/src/main/scala/com/github/shadowsocks/utils/CloseUtils.scala index cb7f9bc1..edd85aeb 100644 --- a/src/main/scala/com/github/shadowsocks/utils/CloseUtils.scala +++ b/src/main/scala/com/github/shadowsocks/utils/CloseUtils.scala @@ -4,14 +4,11 @@ package com.github.shadowsocks.utils * @author Mygod */ object CloseUtils { - type Closeable = { - def close() - } type Disconnectable = { def disconnect() } - def autoClose[A <: Closeable, B](x: => A)(block: A => B): B = { + def autoClose[A <: AutoCloseable, B](x: => A)(block: A => B): B = { var a: Option[A] = None try { a = Some(x)