Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consistent volatile access to running flag in Lifecycle implementations

Browse Source 
Issue: SPR-16488
This commit is contained in:
Juergen Hoeller
2018-03-15 15:17:55 +01:00
parent b8d94f8a20
commit d4a8f76bf9
18 changed files with 97 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
spring-web/src/test/java/org/springframework/http/server/reactive/bootstrap/AbstractHttpServer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ public abstract class AbstractHttpServer implements HttpServer {
private Map<String, HttpHandler> handlerMap;
private boolean running;
private volatile boolean running;
private final Object lifecycleMonitor = new Object();
@@ -87,8 +87,8 @@ public abstract class AbstractHttpServer implements HttpServer {
}
protected HttpHandler resolveHttpHandler() {
return getHttpHandlerMap() != null ?
new ContextPathCompositeHandler(getHttpHandlerMap()) : getHttpHandler();
return (getHttpHandlerMap() != null ?
new ContextPathCompositeHandler(getHttpHandlerMap()) : getHttpHandler());
}
@@ -111,26 +111,23 @@ public abstract class AbstractHttpServer implements HttpServer {
// Lifecycle
@Override
public boolean isRunning() {
synchronized (this.lifecycleMonitor) {
return this.running;
}
}
@Override
public final void start() {
synchronized (this.lifecycleMonitor) {
if (!isRunning()) {
String serverName = getClass().getSimpleName();
logger.debug("Starting " + serverName + "...");
if (logger.isDebugEnabled()) {
logger.debug("Starting " + serverName + "...");
}
this.running = true;
try {
StopWatch stopWatch = new StopWatch();
stopWatch.start();
startInternal();
long millis = stopWatch.getTotalTimeMillis();
logger.debug("Server started on port " + getPort() + "(" + millis + " millis).");
if (logger.isDebugEnabled()) {
logger.debug("Server started on port " + getPort() + "(" + millis + " millis).");
}
}
catch (Throwable ex) {
throw new IllegalStateException(ex);
@@ -167,6 +164,12 @@ public abstract class AbstractHttpServer implements HttpServer {
protected abstract void stopInternal() throws Exception;
@Override
public boolean isRunning() {
return this.running;
}
private void reset() {
this.host = "0.0.0.0";
this.port = 0;