stevel 2005/01/20 07:58:47
Modified: src/main/org/apache/tools/ant Main.java
Log:
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.
Revision Changes Path
1.114 +1 -5 ant/src/main/org/apache/tools/ant/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Main.java,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- Main.java 10 Jan 2005 20:18:27 -0000 1.113
+++ Main.java 20 Jan 2005 15:58:47 -0000 1.114
@@ -603,17 +603,13 @@
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);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
