瀏覽代碼

HDDS-1011. Fix NPE BucketManagerImpl.setBucketProperty. Contributed by Xiaoyu Yao.

Bharat Viswanadham 6 年之前
父節點
當前提交
fb69519e68

+ 3 - 1
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) {
     public Builder addAllMetadata(Map<String, String> additionalMetadata) {
-      metadata.putAll(additionalMetadata);
+      if (additionalMetadata != null) {
+        metadata.putAll(additionalMetadata);
+      }
       return this;
       return this;
     }
     }