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 wa...@apache.org on 2016/05/17 20:18:18 UTC
[28/50] [abbrv] hadoop git commit: HADOOP-13158
S3AFileSystem#toString might throw NullPointerException due to null
cannedACL. (Chris Nauroth via stevel)
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/08ea07f1
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/08ea07f1
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/08ea07f1
Branch: refs/heads/YARN-3368
Commit: 08ea07f1b8edbc38c99015c81a62ca127a247bf7
Parents: c69a649
Author: Steve Loughran <st...@apache.org>
Authored: Tue May 17 13:18:51 2016 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Tue May 17 13:19:29 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/08ea07f1/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 3f9723d..44b8aae 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
@@ -1380,7 +1380,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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org