Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C6E052009D9 for ; Thu, 19 May 2016 21:47:01 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C58EC1609AE; Thu, 19 May 2016 19:47:01 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1BB03160A05 for ; Thu, 19 May 2016 21:47:00 +0200 (CEST) Received: (qmail 49552 invoked by uid 500); 19 May 2016 19:46:51 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 48622 invoked by uid 99); 19 May 2016 19:46:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 May 2016 19:46:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AE6E3E9483; Thu, 19 May 2016 19:46:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: arp@apache.org To: common-commits@hadoop.apache.org Date: Thu, 19 May 2016 19:47:07 -0000 Message-Id: <58d391c4195e4c99ae468d0bace6aa6f@git.apache.org> In-Reply-To: <25255808f6d94e1e9958e0ef532b7599@git.apache.org> References: <25255808f6d94e1e9958e0ef532b7599@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [18/50] [abbrv] hadoop git commit: HADOOP-13158 S3AFileSystem#toString might throw NullPointerException due to null cannedACL. (Chris Nauroth via stevel) archived-at: Thu, 19 May 2016 19:47:01 -0000 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/HDFS-7240 Commit: 08ea07f1b8edbc38c99015c81a62ca127a247bf7 Parents: c69a649 Author: Steve Loughran Authored: Tue May 17 13:18:51 2016 +0100 Committer: Steve Loughran 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