Merge branch '1.4.x' into 1.5.x

wilkinsona · wilkinsona · commit ec8ae2f91ee9 · 2017-06-03T16:53:48.000+01:00
diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java
@@ -255,7 +255,12 @@ public void onNext(Frame item) {
 			return output.toString();
 		}
 		finally {
-			docker.removeContainerCmd(container).exec();
+			try {
+				docker.removeContainerCmd(container).exec();
+			}
+			catch (Exception ex) {
+				// Continue
+			}
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,12 @@ public void onNext(Frame item) {`
`255`	`255`	`return output.toString();`
`256`	`256`	`}`
`257`	`257`	`finally {`
`258`		`- docker.removeContainerCmd(container).exec();`
	`258`	`+ try {`
	`259`	`+ docker.removeContainerCmd(container).exec();`
	`260`	`+ }`
	`261`	`+ catch (Exception ex) {`
	`262`	`+ // Continue`
	`263`	`+ }`
`259`	`264`	`}`
`260`	`265`	`}`
`261`	`266`