Merge pull request #167 from mziccard/fix-bucketinfo-tobuilder

BucketInfo: add null check for rules in builder
googleapis · Sep 18, 2015 · 3739a1a · 3739a1a
2 parents 71b62e8 + 3a183e4
commit 3739a1a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java b/gcloud-java-storage/src/main/java/com/google/gcloud/storage/BucketInfo.java
@@ -453,7 +453,7 @@ public Builder notFoundPage(String notFoundPage) {
     }
 
     public Builder deleteRules(Iterable<? extends DeleteRule> rules) {
-      this.deleteRules = ImmutableList.copyOf(rules);
+      this.deleteRules = rules != null ? ImmutableList.copyOf(rules) : null;
       return this;
     }
 

diff --git a/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketInfoTest.java b/gcloud-java-storage/src/test/java/com/google/gcloud/storage/BucketInfoTest.java
@@ -90,6 +90,12 @@ public void testToBuilder() {
     compareBuckets(BUCKET_INFO, bucketInfo);
   }
 
+  @Test
+  public void testToBuilderIncomplete() {
+    BucketInfo incompleteBucketInfo = BucketInfo.builder("b").build();
+    assertEquals(incompleteBucketInfo.name(), incompleteBucketInfo.toBuilder().build().name());
+  }
+
   @Test
   public void testOf() {
     BucketInfo bucketInfo = BucketInfo.of("bucket");