From 7cc88f02f216ce3a01afb11ee2c21d8e49a62e66 Mon Sep 17 00:00:00 2001 From: Todd Lipcon Date: Wed, 15 Aug 2012 19:25:19 +0000 Subject: [PATCH] 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 --- .../src/main/java/org/apache/hadoop/util/ExitUtil.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java index fbb58e36a9a..72fdb4e4201 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ExitUtil.java @@ -73,15 +73,6 @@ public final class ExitUtil { 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 * that should be used to terminate the daemon processes.