Fix potential NullpointerExceptions

Marcus Linke · Marcus Linke · commit 570fa096b681 · 2015-11-24T20:40:36.000+01:00
diff --git a/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java b/src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
@@ -126,12 +126,12 @@ public String getResolvConfPath() {
 
     @JsonIgnore
     public VolumeBind[] getVolumes() {
-        return volumes.getBinds();
+        return volumes == null ? null : volumes.getBinds();
     }
 
     @JsonIgnore
     public VolumeRW[] getVolumesRW() {
-        return volumesRW.getVolumesRW();
+        return volumesRW == null ? null : volumesRW.getVolumesRW();
     }
 
     public String getHostnamePath() {
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -178,12 +178,13 @@ public static Boolean available(int port) {
      */
     public static void assertContainerHasVolumes(InspectContainerResponse inspectContainerResponse,
             Volume... expectedVolumes) {
-        VolumeBind[] volumeBinds = inspectContainerResponse.getVolumes();
-        LOG.info("Inspect .Volumes = [{}]", Joiner.on(", ").join(volumeBinds));
 
         List<Volume> volumes = new ArrayList<Volume>();
-        for (VolumeBind bind : volumeBinds) {
-            volumes.add(new Volume(bind.getContainerPath()));
+        VolumeBind[] volumeBinds = inspectContainerResponse.getVolumes();
+        if (volumeBinds != null) {
+            for (VolumeBind bind : volumeBinds) {
+                volumes.add(new Volume(bind.getContainerPath()));
+            }
         }
         assertThat(volumes, contains(expectedVolumes));
     }

Original file line number	Diff line number	Diff line change
`@@ -126,12 +126,12 @@ public String getResolvConfPath() {`
`126`	`126`
`127`	`127`	`@JsonIgnore`
`128`	`128`	`public VolumeBind[] getVolumes() {`
`129`		`- return volumes.getBinds();`
	`129`	`+ return volumes == null ? null : volumes.getBinds();`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`@JsonIgnore`
`133`	`133`	`public VolumeRW[] getVolumesRW() {`
`134`		`- return volumesRW.getVolumesRW();`
	`134`	`+ return volumesRW == null ? null : volumesRW.getVolumesRW();`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`public String getHostnamePath() {`