From 1f6d6bbd1459b1698dd11ab51d8e6c40852a1e2c Mon Sep 17 00:00:00 2001 From: Mygod Date: Mon, 9 Jan 2017 15:41:19 +0800 Subject: [PATCH] Update Acl.scala to be compliant with acl.c --- src/main/scala/com/github/shadowsocks/acl/Acl.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/com/github/shadowsocks/acl/Acl.scala b/src/main/scala/com/github/shadowsocks/acl/Acl.scala index 7f70314b..0e6a7dad 100644 --- a/src/main/scala/com/github/shadowsocks/acl/Acl.scala +++ b/src/main/scala/com/github/shadowsocks/acl/Acl.scala @@ -58,8 +58,8 @@ class Acl { bypass = false lazy val bypassSubnets = new mutable.SortedList[Subnet]() lazy val proxySubnets = new mutable.SortedList[Subnet]() - var hostnames: mutable.SortedList[String] = proxyHostnames - var subnets: mutable.SortedList[Subnet] = proxySubnets + var hostnames: mutable.SortedList[String] = bypassHostnames + var subnets: mutable.SortedList[Subnet] = bypassSubnets for (line <- value.getLines()) (line.indexOf('#') match { case -1 => line case index => line.substring(0, index) // trim comments