root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson 2017-08-03 21:23:20 +01:00
parent 09b41a33e8 1f37da5b06
commit 5c06bd5ab9
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/BackgroundPreinitializer.java
View File

@ -46,14 +46,14 @@ import org.springframework.http.converter.support.AllEncompassingFormHttpMessage
public class BackgroundPreinitializer
implements ApplicationListener<SpringApplicationEvent> {
private static final AtomicBoolean preinitalizationStarted = new AtomicBoolean(false);
private static final AtomicBoolean preinitializationStarted = new AtomicBoolean(false);
private static final CountDownLatch preinitializationComplete = new CountDownLatch(1);
@Override
public void onApplicationEvent(SpringApplicationEvent event) {
if (event instanceof ApplicationEnvironmentPreparedEvent) {
if (preinitalizationStarted.compareAndSet(false, true)) {
if (preinitializationStarted.compareAndSet(false, true)) {
performPreinitialization();
}
}

2
spring-boot-docs/src/main/asciidoc/deployment.adoc
View File

@ -444,7 +444,7 @@ then use the https://cloud.google.com/sdk/downloads[Google Cloud SDK] to push yo
Spring Boot app into that slot from the command line or CI build.
App Engine needs you to create an `app.yaml` file to describe the resources your app
requires. Normally you put this in `src/min/appengine`, and it looks something like this:
requires. Normally you put this in `src/main/appengine`, and it looks something like this:
[source,yaml,indent=0]
----

4
spring-boot/src/test/java/org/springframework/boot/context/properties/source/UnboundElementsSourceFilterTests.java
View File

@ -44,7 +44,7 @@ public class UnboundElementsSourceFilterTests {
}
@Test
public void filterWhenSourceIsSystemEnvironmentPropertySourceShouldReturnFalse()
public void filterWhenSourceIsSystemPropertiesPropertySourceShouldReturnFalse()
throws Exception {
MockPropertySource propertySource = new MockPropertySource(
StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME);
@ -53,7 +53,7 @@ public class UnboundElementsSourceFilterTests {
}
@Test
public void filterWhenSourceIsSystemPropertiesPropertySourceShouldReturnTrue()
public void filterWhenSourceIsSystemEnvironmentPropertySourceShouldReturnFalse()
throws Exception {
MockPropertySource propertySource = new MockPropertySource(
StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME);