root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Fix service integration tests

Browse Source
pull/1/merge
Dave Syer 12 years ago
parent 361f500ed5
commit dd1fc3f992
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File

6
spring-bootstrap-service/src/main/java/org/springframework/bootstrap/service/shutdown/ShutdownEndpoint.java
Unescape Escape View File

@ -48,10 +48,13 @@ public class ShutdownEndpoint implements ApplicationContextAware,
@Autowired @Autowired
private ContainerProperties configuration = new ContainerProperties(); private ContainerProperties configuration = new ContainerProperties();
private boolean shuttingDown = false;
@RequestMapping(value = "${endpoints.shutdown.path:/shutdown}", method = RequestMethod.POST) @RequestMapping(value = "${endpoints.shutdown.path:/shutdown}", method = RequestMethod.POST)
@ResponseBody @ResponseBody
public Map<String, Object> shutdown() { public Map<String, Object> shutdown() {
if (this.configuration.isAllowShutdown()) { if (this.configuration.isAllowShutdown()) {
this.shuttingDown = true;
return Collections.<String, Object> singletonMap("message", return Collections.<String, Object> singletonMap("message",
"Shutting down, bye..."); "Shutting down, bye...");
} else { } else {
@ -70,7 +73,8 @@ public class ShutdownEndpoint implements ApplicationContextAware,
@Override @Override
public void onApplicationEvent(ServletRequestHandledEvent event) { public void onApplicationEvent(ServletRequestHandledEvent event) {
if (this.context != null && this.configuration.isAllowShutdown()) { if (this.context != null && this.configuration.isAllowShutdown()
&& this.shuttingDown) {
new Thread(new Runnable() { new Thread(new Runnable() {
@Override @Override

Write Preview
Loading…
Cancel
Save