Browse Source

Revert setting of security manager.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270152 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 23 years ago
parent
commit
ff4e823ee2
1 changed files with 8 additions and 1 deletions
  1. +8
    -1
      src/main/org/apache/tools/ant/Main.java

+ 8
- 1
src/main/org/apache/tools/ant/Main.java View File

@@ -164,6 +164,7 @@ public class Main {
} }
System.exit(1); System.exit(1);
} catch(Throwable exc) { } catch(Throwable exc) {
exc.printStackTrace();
printMessage(exc); printMessage(exc);
System.exit(1); System.exit(1);
} }
@@ -424,7 +425,11 @@ public class Main {
if ( !Project.JAVA_1_0.equals(Project.getJavaVersion()) && if ( !Project.JAVA_1_0.equals(Project.getJavaVersion()) &&
!Project.JAVA_1_1.equals(Project.getJavaVersion()) ){ !Project.JAVA_1_1.equals(Project.getJavaVersion()) ){
oldsm = System.getSecurityManager(); oldsm = System.getSecurityManager();
System.setSecurityManager(new NoExitSecurityManager());

//SecurityManager can not be installed here for backwards
//compatability reasons (PD). Needs to be loaded prior to
//ant class if we are going to implement it.
//System.setSecurityManager(new NoExitSecurityManager());
} }
try { try {
System.setOut(new PrintStream(new DemuxOutputStream(project, false))); System.setOut(new PrintStream(new DemuxOutputStream(project, false)));
@@ -476,9 +481,11 @@ public class Main {
} }
finally { finally {
// put back the original security manager // put back the original security manager
//The following will never eval to true. (PD)
if (oldsm != null){ if (oldsm != null){
System.setSecurityManager(oldsm); System.setSecurityManager(oldsm);
} }

System.setOut(out); System.setOut(out);
System.setErr(err); System.setErr(err);
} }


Loading…
Cancel
Save