Merge branch '1.4.x' into 1.5.x

ec8ae2f9 · Andy Wilkinson · a215103b · e60a2619 · ec8ae2f9
Commit ec8ae2f9 authored Jun 03, 2017 by Andy Wilkinson
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

SysVinitLaunchScriptIT.java ...ngframework/boot/launchscript/SysVinitLaunchScriptIT.java +6 -1

No files found.
--- 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 class SysVinitLaunchScriptIT {
 			return output.toString();
 		}
 		finally {
-			docker.removeContainerCmd(container).exec();
+			try {
+				docker.removeContainerCmd(container).exec();
+			}
+			catch (Exception ex) {
+				// Continue
+			}
 		}
 	}