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

Merge branch '1.4.x' into 1.5.x

Browse Source
This commit is contained in:
Stephane Nicoll
2016-10-02 11:08:33 +02:00
parent 75f475f2c8 4dfdce5a49
commit e643fc5bd1
11 changed files with 26 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/OnInitializedRestarterCondition.java
View File

@@ -24,7 +24,7 @@ import org.springframework.context.annotation.ConditionContext;
import org.springframework.core.type.AnnotatedTypeMetadata;
/**
* {@link Condition} that checks that a {@link Restarter} is available an initialized.
* {@link Condition} that checks that a {@link Restarter} is available and initialized.
*
* @author Phillip Webb
* @see ConditionalOnInitializedRestarter
@@ -35,7 +35,7 @@ class OnInitializedRestarterCondition extends SpringBootCondition {
public ConditionOutcome getMatchOutcome(ConditionContext context,
AnnotatedTypeMetadata metadata) {
ConditionMessage.Builder message = ConditionMessage
.forCondition("Initializer Restarter Condition");
.forCondition("Initialized Restarter Condition");
Restarter restarter = getRestarter();
if (restarter == null) {
return ConditionOutcome.noMatch(message.because("unavailable"));