Fix a merge mistake from last trunk merge.
ExitUtil.java ended up with a duplicate definition of resetFirstExitException since it was added both in trunk and branch. Deleted one of them. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3077@1373592 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
5789de83a7
commit
7cc88f02f2
|
@ -73,15 +73,6 @@ public final class ExitUtil {
|
||||||
firstExitException = null;
|
firstExitException = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Reset the tracking of process termination. This is for use
|
|
||||||
* in unit tests where one test in the suite expects an exit
|
|
||||||
* but others do not.
|
|
||||||
*/
|
|
||||||
public static void resetFirstExitException() {
|
|
||||||
firstExitException = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Terminate the current process. Note that terminate is the *only* method
|
* Terminate the current process. Note that terminate is the *only* method
|
||||||
* that should be used to terminate the daemon processes.
|
* that should be used to terminate the daemon processes.
|
||||||
|
|
Loading…
Reference in New Issue