Merge pull request #604 from johnflavin/flavin/603

Only copy volumes if non-null
spotify · Feb 3, 2017 · c6e752d · c6e752d
2 parents 30df02c + bad0952
commit c6e752d
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/java/com/spotify/docker/client/messages/VolumeList.java b/src/main/java/com/spotify/docker/client/messages/VolumeList.java
@@ -36,6 +36,7 @@
 @JsonAutoDetect(fieldVisibility = ANY, getterVisibility = NONE, setterVisibility = NONE)
 public abstract class VolumeList {
 
+  @Nullable
   @JsonProperty("Volumes")
   public abstract ImmutableList<Volume> volumes();
 
@@ -47,8 +48,10 @@ public abstract class VolumeList {
   static VolumeList create(
       @JsonProperty("Volumes") final List<Volume> volumes,
       @JsonProperty("Warnings") final List<String> warnings) {
+    final ImmutableList<Volume> volumesCopy = volumes == null
+                                               ? null : ImmutableList.copyOf(volumes);
     final ImmutableList<String> warningsCopy = warnings == null
                                                ? null : ImmutableList.copyOf(warnings);
-    return new AutoValue_VolumeList(ImmutableList.copyOf(volumes), warningsCopy);
+    return new AutoValue_VolumeList(volumesCopy, warningsCopy);
   }
 }