Browse Source

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

Steve Loughran 9 years ago
parent
commit
08ea07f1b8

+ 3 - 1
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(", partSize=").append(partSize);
     sb.append(", enableMultiObjectsDelete=").append(enableMultiObjectsDelete);
     sb.append(", enableMultiObjectsDelete=").append(enableMultiObjectsDelete);
     sb.append(", maxKeys=").append(maxKeys);
     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(", readAhead=").append(readAhead);
     sb.append(", blockSize=").append(getDefaultBlockSize());
     sb.append(", blockSize=").append(getDefaultBlockSize());
     sb.append(", multiPartThreshold=").append(multiPartThreshold);
     sb.append(", multiPartThreshold=").append(multiPartThreshold);