Browse Source

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
master
Peter Donald 24 years ago
parent
commit
c758ec76a2
4 changed files with 4 additions and 28 deletions
  1. +1
    -2
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
  2. +1
    -12
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute.java
  3. +1
    -2
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
  4. +1
    -12
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/Execute.java

+ 1
- 2
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java View File

@@ -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 )
{


+ 1
- 12
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute.java View File

@@ -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;
}

/**


+ 1
- 2
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java View File

@@ -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 )
{


+ 1
- 12
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/Execute.java View File

@@ -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;
}

/**


Loading…
Cancel
Save