svn commit: r1373592 - /hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java

[to...@apache.org]

Author: todd
Date: Wed Aug 15 19:25:19 2012
New Revision: 1373592

URL: http://svn.apache.org/viewvc?rev=1373592&view=rev
Log:
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.

Modified:
    hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java

Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java?rev=1373592&r1=1373591&r2=1373592&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java Wed Aug 15 19:25:19 2012
@@ -74,15 +74,6 @@ public final class ExitUtil {
   }
 
   /**
-   * 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
    * that should be used to terminate the daemon processes.
    * @param status exit code