You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by vi...@apache.org on 2015/06/11 08:22:53 UTC
hadoop git commit: HADOOP-12074. in Shell.java#runCommand() rethrow
InterruptedException as InterruptedIOException (Contributed by Lavkesh
Lahngir)
Repository: hadoop
Updated Branches:
refs/heads/trunk 5583f88bf -> 95c73d49b
HADOOP-12074. in Shell.java#runCommand() rethrow InterruptedException as InterruptedIOException (Contributed by Lavkesh Lahngir)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/95c73d49
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/95c73d49
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/95c73d49
Branch: refs/heads/trunk
Commit: 95c73d49b1bb459b626a9ac52acadb8f5fa724de
Parents: 5583f88
Author: Vinayakumar B <vi...@apache.org>
Authored: Thu Jun 11 11:51:14 2015 +0530
Committer: Vinayakumar B <vi...@apache.org>
Committed: Thu Jun 11 11:51:14 2015 +0530
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../src/main/java/org/apache/hadoop/util/Shell.java | 5 ++++-
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/95c73d49/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 134c834..4df6112 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -849,6 +849,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-7817. RawLocalFileSystem.append() should give FSDataOutputStream
with accurate .getPos() (kanaka kumar avvaru via vinayakumarb)
+ HADOOP-12074. in Shell.java#runCommand() rethrow InterruptedException as
+ InterruptedIOException (Lavkesh Lahngir via vinayakumarb)
+
Release 2.7.1 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/95c73d49/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
index c76c921..45c1588 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
@@ -22,6 +22,7 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.InputStream;
+import java.io.InterruptedIOException;
import java.nio.charset.Charset;
import java.util.Arrays;
import java.util.Map;
@@ -554,7 +555,9 @@ abstract public class Shell {
throw new ExitCodeException(exitCode, errMsg.toString());
}
} catch (InterruptedException ie) {
- throw new IOException(ie.toString());
+ InterruptedIOException iie = new InterruptedIOException(ie.toString());
+ iie.initCause(ie);
+ throw iie;
} finally {
if (timeOutTimer != null) {
timeOutTimer.cancel();