This is an automated email from the ASF dual-hosted git repository.
bharat pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new fb69519 HDDS-1011. Fix NPE BucketManagerImpl.setBucketProperty.
Contributed by Xiaoyu Yao.
fb69519 is described below
commit fb69519e68c53aa2830ac50915011867ab0b1971
Author: Bharat Viswanadham <[email protected]>
AuthorDate: Fri Jan 25 14:46:17 2019 -0800
HDDS-1011. Fix NPE BucketManagerImpl.setBucketProperty. Contributed by
Xiaoyu Yao.
---
.../main/java/org/apache/hadoop/ozone/om/helpers/OmBucketInfo.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmBucketInfo.java
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmBucketInfo.java
index 1cd6719..14ed5f6 100644
---
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmBucketInfo.java
+++
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmBucketInfo.java
@@ -219,7 +219,9 @@ public final class OmBucketInfo extends WithMetadata
implements Auditable {
}
public Builder addAllMetadata(Map<String, String> additionalMetadata) {
- metadata.putAll(additionalMetadata);
+ if (additionalMetadata != null) {
+ metadata.putAll(additionalMetadata);
+ }
return this;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
