summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJan Niehusmann <jan@gondor.com>2012-11-09 15:05:44 +0100
committerJan Niehusmann <jan@gondor.com>2012-11-09 15:05:44 +0100
commit1315a1f387e92cafd1c101725c7edff7b82bd906 (patch)
treee971ca11d5296c2e53c778422a801dc1e08ce0de /test
parent4f98d50bc23acab19e99d35c3e6a046a147984ba (diff)
downloadscala-1315a1f387e92cafd1c101725c7edff7b82bd906.tar.gz
scala-1315a1f387e92cafd1c101725c7edff7b82bd906.tar.bz2
scala-1315a1f387e92cafd1c101725c7edff7b82bd906.zip
fix t2318.scala
Diffstat (limited to 'test')
-rw-r--r--test/files/run/t2318.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/files/run/t2318.scala b/test/files/run/t2318.scala
index e42cbb9680..47d083eb9d 100644
--- a/test/files/run/t2318.scala
+++ b/test/files/run/t2318.scala
@@ -7,7 +7,8 @@ object Test {
override def checkPermission(perm: Permission) = perm match {
case _: java.lang.RuntimePermission => ()
case _: java.io.FilePermission => ()
- case x: java.security.AccessControlException if x.getName contains ".networkaddress." => () // generality ftw
+ case x: java.security.SecurityPermission if x.getName contains ".networkaddress." => () // generality ftw
+ case x: java.util.PropertyPermission if x.getName == "sun.net.inetaddr.ttl" => ()
case _ => super.checkPermission(perm)
}
}