From d75862ba284162c9b02c2cc3d915ae79b11d2c65 Mon Sep 17 00:00:00 2001 From: Steve Loughran Date: Thu, 20 Jan 2005 15:58:47 +0000 Subject: [PATCH] I pulled out a bit of pre-1.2 testing, but the code it wrapped is probably unneeded, as we dont set a security manager. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277396 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/Main.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/org/apache/tools/ant/Main.java b/src/main/org/apache/tools/ant/Main.java index 7709529d0..fd0be7e17 100644 --- a/src/main/org/apache/tools/ant/Main.java +++ b/src/main/org/apache/tools/ant/Main.java @@ -603,17 +603,13 @@ public class Main implements AntMain { InputStream in = System.in; // use a system manager that prevents from System.exit() - // only in JDK > 1.1 SecurityManager oldsm = null; - if (!JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_0) - && !JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_1)) { - oldsm = System.getSecurityManager(); + oldsm = System.getSecurityManager(); //SecurityManager can not be installed here for backwards //compatibility reasons (PD). Needs to be loaded prior to //ant class if we are going to implement it. //System.setSecurityManager(new NoExitSecurityManager()); - } try { if (allowInput) { project.setDefaultInputStream(System.in);