spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-22 00:29:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '1.4.x' into 1.5.x

Browse Source
This commit is contained in:
Andy Wilkinson
2017-06-03 16:53:48 +01:00
parent a215103bb5 e60a261952
commit ec8ae2f91e
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java
+6 -1
View File
@@ -255,7 +255,12 @@ public class SysVinitLaunchScriptIT {
return output.toString();
}
finally {
docker.removeContainerCmd(container).exec();
try {
docker.removeContainerCmd(container).exec();
}
catch (Exception ex) {
// Continue
}
}
}