summaryrefslogtreecommitdiff
path: root/test/files/run/bug2318.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2010-11-30 20:58:29 +0000
committerPaul Phillips <paulp@improving.org>2010-11-30 20:58:29 +0000
commit6b274687b355e5bcd6a49a0ec3b63031a28c87ea (patch)
tree01d6a90811b4dcbc27473437cf25ec201e8f3e72 /test/files/run/bug2318.scala
parent51e4a6a351a64a1bff995e1b5fefb88c7e2430eb (diff)
downloadscala-6b274687b355e5bcd6a49a0ec3b63031a28c87ea.tar.gz
scala-6b274687b355e5bcd6a49a0ec3b63031a28c87ea.tar.bz2
scala-6b274687b355e5bcd6a49a0ec3b63031a28c87ea.zip
Attempt to fix failing test. No review.
Diffstat (limited to 'test/files/run/bug2318.scala')
-rw-r--r--test/files/run/bug2318.scala7
1 files changed, 4 insertions, 3 deletions
diff --git a/test/files/run/bug2318.scala b/test/files/run/bug2318.scala
index 8347ed8e7b..cb524471d6 100644
--- a/test/files/run/bug2318.scala
+++ b/test/files/run/bug2318.scala
@@ -5,9 +5,10 @@ object Test {
object Mgr extends SecurityManager {
override def checkPermission(perm: Permission) = perm match {
- case _: java.lang.RuntimePermission => ()
- case _: java.io.FilePermission => ()
- case _ => super.checkPermission(perm)
+ case _: java.lang.RuntimePermission => ()
+ case _: java.io.FilePermission => ()
+ case x: java.security.AccessControlException if x.getName contains ".networkaddress." => () // generality ftw
+ case _ => super.checkPermission(perm)
}
}