Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-10542 Potential null pointer dereference in Jets3tFileSystemStore retrieveBlock(). (Ted Yu via stevel)

This commit is contained in:
Steve Loughran 2015-01-17 18:26:03 +00:00
parent 43302f6f44
commit c6c0f4eb25
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -716,6 +716,9 @@ Release 2.7.0 - UNRELEASED
HADOOP-11350. The size of header buffer of HttpServer is too small when HADOOP-11350. The size of header buffer of HttpServer is too small when
HTTPS is enabled. (Benoy Antony via wheat9) 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 Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java
View File

@ -173,7 +173,7 @@ class Jets3tFileSystemStore implements FileSystemStore {
return object.getDataInputStream(); return object.getDataInputStream();
} catch (S3ServiceException e) { } catch (S3ServiceException e) {
if ("NoSuchKey".equals(e.getS3ErrorCode())) { if ("NoSuchKey".equals(e.getS3ErrorCode())) {
return null; throw new IOException(key + " doesn't exist");
} }
if (e.getCause() instanceof IOException) { if (e.getCause() instanceof IOException) {
throw (IOException) e.getCause(); throw (IOException) e.getCause();