Repository: hadoop Updated Branches: refs/heads/trunk d4626b4d1 -> 7ba1cfdea
HADOOP-15827. NPE in DynamoDBMetadataStore.lambda$listChildren for root + auth S3Guard. Contributed by Gabor Bota Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7ba1cfde Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7ba1cfde Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7ba1cfde Branch: refs/heads/trunk Commit: 7ba1cfdea7f5daf799adc4f0ed2e45f55841a058 Parents: d4626b4 Author: Steve Loughran <[email protected]> Authored: Tue Oct 9 10:46:41 2018 +0100 Committer: Steve Loughran <[email protected]> Committed: Tue Oct 9 10:46:41 2018 +0100 ---------------------------------------------------------------------- .../org/apache/hadoop/fs/s3a/s3guard/DynamoDBMetadataStore.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7ba1cfde/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/s3guard/DynamoDBMetadataStore.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/s3guard/DynamoDBMetadataStore.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/s3guard/DynamoDBMetadataStore.java index 5716cfa..f34afb5 100644 --- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/s3guard/DynamoDBMetadataStore.java +++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/s3guard/DynamoDBMetadataStore.java @@ -630,7 +630,7 @@ public class DynamoDBMetadataStore implements MetadataStore { LOG.trace("Listing table {} in region {} for {} returning {}", tableName, region, path, metas); - return (metas.isEmpty() && dirPathMeta == null) + return (metas.isEmpty() || dirPathMeta == null) ? null : new DirListingMetadata(path, metas, isAuthoritative, dirPathMeta.getLastUpdated()); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
