HADOOP-13158 S3AFileSystem#toString might throw NullPointerException due to null cannedACL. (Chris Nauroth via stevel)

This commit is contained in:
Steve Loughran 2016-05-17 13:18:51 +01:00
parent b44ecfff12
commit 42d9beaa1d
1 changed files with 3 additions and 1 deletions

View File

@ -1443,7 +1443,9 @@ public class S3AFileSystem extends FileSystem {
sb.append(", partSize=").append(partSize); sb.append(", partSize=").append(partSize);
sb.append(", enableMultiObjectsDelete=").append(enableMultiObjectsDelete); sb.append(", enableMultiObjectsDelete=").append(enableMultiObjectsDelete);
sb.append(", maxKeys=").append(maxKeys); sb.append(", maxKeys=").append(maxKeys);
if (cannedACL != null) {
sb.append(", cannedACL=").append(cannedACL.toString()); sb.append(", cannedACL=").append(cannedACL.toString());
}
sb.append(", readAhead=").append(readAhead); sb.append(", readAhead=").append(readAhead);
sb.append(", blockSize=").append(getDefaultBlockSize()); sb.append(", blockSize=").append(getDefaultBlockSize());
sb.append(", multiPartThreshold=").append(multiPartThreshold); sb.append(", multiPartThreshold=").append(multiPartThreshold);