From c758ec76a28ad4311f06b184ec39eec9d8b09716 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Sat, 22 Dec 2001 22:14:26 +0000 Subject: [PATCH] Remove Execute.getExitValue() as it is not needed. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270323 13f79535-47bb-0310-9956-ffa450edef68 --- .../taskdefs/compilers/DefaultCompilerAdapter.java | 3 +-- .../org/apache/tools/ant/taskdefs/exec/Execute.java | 13 +------------ .../taskdefs/compilers/DefaultCompilerAdapter.java | 3 +-- .../org/apache/tools/ant/taskdefs/exec/Execute.java | 13 +------------ 4 files changed, 4 insertions(+), 28 deletions(-) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java index fb5eef31a..da7b12c29 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java @@ -439,8 +439,7 @@ public abstract class DefaultCompilerAdapter implements CompilerAdapter Project.MSG_WARN ) ); exe.setWorkingDirectory( project.getBaseDir() ); exe.setCommandline( commandArray ); - exe.execute(); - return exe.getExitValue(); + return exe.execute(); } catch( IOException e ) { diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute.java index a26a514f5..00ce9b2ae 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute.java @@ -286,17 +286,6 @@ public class Execute } } - /** - * query the exit value of the process. - * - * @return the exit value, 1 if the process was killed, or Project.INVALID - * if no exit value has been received - */ - public int getExitValue() - { - return m_exitValue; - } - /** * Runs a process defined by the command line and returns its exit status. * @@ -346,7 +335,7 @@ public class Execute m_streamHandler.stop(); if( m_watchdog != null ) m_watchdog.checkException(); - return getExitValue(); + return m_exitValue; } /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java index fb5eef31a..da7b12c29 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java @@ -439,8 +439,7 @@ public abstract class DefaultCompilerAdapter implements CompilerAdapter Project.MSG_WARN ) ); exe.setWorkingDirectory( project.getBaseDir() ); exe.setCommandline( commandArray ); - exe.execute(); - return exe.getExitValue(); + return exe.execute(); } catch( IOException e ) { diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/Execute.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/Execute.java index a26a514f5..00ce9b2ae 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/Execute.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/Execute.java @@ -286,17 +286,6 @@ public class Execute } } - /** - * query the exit value of the process. - * - * @return the exit value, 1 if the process was killed, or Project.INVALID - * if no exit value has been received - */ - public int getExitValue() - { - return m_exitValue; - } - /** * Runs a process defined by the command line and returns its exit status. * @@ -346,7 +335,7 @@ public class Execute m_streamHandler.stop(); if( m_watchdog != null ) m_watchdog.checkException(); - return getExitValue(); + return m_exitValue; } /**