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 st...@apache.org on 2015/01/17 19:26:29 UTC
[1/2] hadoop git commit: HADOOP-10542 Potential null pointer
dereference in Jets3tFileSystemStore retrieveBlock(). (Ted Yu via stevel)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 4d8fa9615 -> ed2f8a1ba
refs/heads/trunk 43302f6f4 -> c6c0f4eb2
HADOOP-10542 Potential null pointer dereference in Jets3tFileSystemStore retrieveBlock(). (Ted Yu via stevel)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ed2f8a1b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ed2f8a1b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ed2f8a1b
Branch: refs/heads/branch-2
Commit: ed2f8a1ba06a5b926ad98dd7992f2cf2192aaf4f
Parents: 4d8fa96
Author: Steve Loughran <st...@apache.org>
Authored: Sat Jan 17 18:26:03 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sat Jan 17 18:26:03 2015 +0000
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../main/java/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ed2f8a1b/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 2b878dc..d7831d6 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -360,6 +360,9 @@ Release 2.7.0 - UNRELEASED
HADOOP-11350. The size of header buffer of HttpServer is too small when
HTTPS is enabled. (Benoy Antony via wheat9)
+ HADOOP-10542 Potential null pointer dereference in Jets3tFileSystemStore
+ retrieveBlock(). (Ted Yu via stevel)
+
Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ed2f8a1b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java
index 7f07bbb..901f89b 100644
--- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java
+++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java
@@ -167,7 +167,7 @@ class Jets3tFileSystemStore implements FileSystemStore {
return object.getDataInputStream();
} catch (S3ServiceException e) {
if ("NoSuchKey".equals(e.getS3ErrorCode())) {
- return null;
+ throw new IOException(key + " doesn't exist");
}
if (e.getCause() instanceof IOException) {
throw (IOException) e.getCause();
[2/2] hadoop git commit: HADOOP-10542 Potential null pointer
dereference in Jets3tFileSystemStore retrieveBlock(). (Ted Yu via stevel)
Posted by st...@apache.org.
HADOOP-10542 Potential null pointer dereference in Jets3tFileSystemStore retrieveBlock(). (Ted Yu via stevel)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c6c0f4eb
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c6c0f4eb
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c6c0f4eb
Branch: refs/heads/trunk
Commit: c6c0f4eb25e511944915bc869e741197f7a277e0
Parents: 43302f6
Author: Steve Loughran <st...@apache.org>
Authored: Sat Jan 17 18:26:03 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sat Jan 17 18:26:26 2015 +0000
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../main/java/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c6c0f4eb/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 6896fe2..b2c1af3 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -716,6 +716,9 @@ Release 2.7.0 - UNRELEASED
HADOOP-11350. The size of header buffer of HttpServer is too small when
HTTPS is enabled. (Benoy Antony via wheat9)
+ HADOOP-10542 Potential null pointer dereference in Jets3tFileSystemStore
+ retrieveBlock(). (Ted Yu via stevel)
+
Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c6c0f4eb/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java
index 241ec0f..5f46aea 100644
--- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java
+++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java
@@ -173,7 +173,7 @@ class Jets3tFileSystemStore implements FileSystemStore {
return object.getDataInputStream();
} catch (S3ServiceException e) {
if ("NoSuchKey".equals(e.getS3ErrorCode())) {
- return null;
+ throw new IOException(key + " doesn't exist");
}
if (e.getCause() instanceof IOException) {
throw (IOException) e.getCause();