Repository: hadoop Updated Branches: refs/heads/branch-2 dfc062a09 -> dd0a8201b
HADOOP-13158 S3AFileSystem#toString might throw NullPointerException due to null cannedACL. (Chris Nauroth via stevel) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dd0a8201 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dd0a8201 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dd0a8201 Branch: refs/heads/branch-2 Commit: dd0a8201bc078e09f29b002317d2c6a4441b1722 Parents: dfc062a Author: Steve Loughran <ste...@apache.org> Authored: Tue May 17 13:18:51 2016 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Tue May 17 13:19:08 2016 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd0a8201/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java index d6a4617..eb64bf1 100644 --- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java +++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AFileSystem.java @@ -1443,7 +1443,9 @@ public class S3AFileSystem extends FileSystem { sb.append(", partSize=").append(partSize); sb.append(", enableMultiObjectsDelete=").append(enableMultiObjectsDelete); sb.append(", maxKeys=").append(maxKeys); - sb.append(", cannedACL=").append(cannedACL.toString()); + if (cannedACL != null) { + sb.append(", cannedACL=").append(cannedACL.toString()); + } sb.append(", readAhead=").append(readAhead); sb.append(", blockSize=").append(getDefaultBlockSize()); sb.append(", multiPartThreshold=").append(multiPartThreshold); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
