user decides to add a SecurityManager or not

1 files changed, 6 insertions, 16 deletions

diff --git a/src/compiler/scala/tools/nsc/MainGenericRunner.scala b/src/compiler/scala/tools/nsc/MainGenericRunner.scala
index ac895cea6f..b8e9e7e3f8 100644
--- a/src/compiler/scala/tools/nsc/MainGenericRunner.scala
+++ b/src/compiler/scala/tools/nsc/MainGenericRunner.scala
@@ -113,22 +113,12 @@ object MainGenericRunner {
       try { Some(new URL(spec)) }
       catch { case e => Console.println(e); None }
 
-    def urls(specs: String): List[URL] = {
-      val urls =
-        if (specs == null || specs.length == 0) Nil
-        else for (
-          spec <- specs.split(" ").toList;
-          val url = specToURL(spec); if !url.isEmpty
-        ) yield url.get
-      if (!urls.isEmpty && (System.getSecurityManager == null)) {
-        // Here we require a security manager to be present !
-        // Security permissions are defined in a user-defined
-        // file to be specified in the environment variable
-        // JAVA_OPTS="-Djava.security.policy=scala.policy"
-        System.setSecurityManager(new SecurityManager())
-      }
-      urls
-    }
+    def urls(specs: String): List[URL] =
+      if (specs == null || specs.length == 0) Nil
+      else for (
+        spec <- specs.split(" ").toList;
+        val url = specToURL(spec); if !url.isEmpty
+      ) yield url.get
 
     val classpath: List[URL] =
       paths(settings.bootclasspath.value) :::