Merge pull request #287 from alexwix/master

marcuslinke · marcuslinke · commit 4887df03f305 · 2015-08-13T10:44:16.000+02:00
Using the oomKillDisable flag throws a null pointer exception.
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -631,7 +631,7 @@ public CreateContainerCmd withNetworkMode(String networkMode) {
     public CreateContainerCmd withOomKillDisable(Boolean oomKillDisable) {
         checkNotNull(oomKillDisable, "oomKillDisable was not specified");
         this.oomKillDisable = oomKillDisable;
-        return null;
+        return this;
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -631,7 +631,7 @@ public CreateContainerCmd withNetworkMode(String networkMode) {`
`631`	`631`	`public CreateContainerCmd withOomKillDisable(Boolean oomKillDisable) {`
`632`	`632`	`checkNotNull(oomKillDisable, "oomKillDisable was not specified");`
`633`	`633`	`this.oomKillDisable = oomKillDisable;`
`634`		`- return null;`
	`634`	`+ return this;`
`635`	`635`	`}`
`636`	`636`
`637`	`637`	`@Override`