Skip to content

S
spring-boot
Commit ec8ae2f9 authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '1.4.x' into 1.5.x

parents a215103b e60a2619
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 1 deletion
spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java
View file @ ec8ae2f9
...@@ -255,8 +255,13 @@ public class SysVinitLaunchScriptIT { ...@@ -255,8 +255,13 @@ public class SysVinitLaunchScriptIT {
return output.toString(); return output.toString();
} }
finally { finally {
try {
docker.removeContainerCmd(container).exec(); docker.removeContainerCmd(container).exec();
} }
catch (Exception ex) {
// Continue
}
}
} }
private DockerClient createClient() { private DockerClient createClient() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment