ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant Main.java
Date Sat, 26 Feb 2005 21:16:58 GMT
jkf         2005/02/26 13:16:58

  Modified:    src/main/org/apache/tools/ant Main.java
  Log:
  renamed hidden variables
  
  Revision  Changes    Path
  1.117     +9 -9      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.116
  retrieving revision 1.117
  diff -u -r1.116 -r1.117
  --- Main.java	21 Jan 2005 11:24:26 -0000	1.116
  +++ Main.java	26 Feb 2005 21:16:58 -0000	1.117
  @@ -597,9 +597,9 @@
               addBuildListeners(project);
               addInputHandler(project);
   
  -            PrintStream err = System.err;
  -            PrintStream out = System.out;
  -            InputStream in = System.in;
  +            PrintStream savedErr = System.err;
  +            PrintStream savedOut = System.out;
  +            InputStream savedIn = System.in;
   
               // use a system manager that prevents from System.exit()
               SecurityManager oldsm = null;
  @@ -673,16 +673,16 @@
                       System.setSecurityManager(oldsm);
                   }
   
  -                System.setOut(out);
  -                System.setErr(err);
  -                System.setIn(in);
  +                System.setOut(savedOut);
  +                System.setErr(savedErr);
  +                System.setIn(savedIn);
               }
           } catch (RuntimeException exc) {
               error = exc;
               throw exc;
  -        } catch (Error err) {
  -            error = err;
  -            throw err;
  +        } catch (Error e) {
  +            error = e;
  +            throw e;
           } finally {
               if (!projectHelp) {
                   project.fireBuildFinished(error);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message