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

Merge branch '2.2.x' 

Closes gh-20868
This commit is contained in:
Stephane Nicoll 2020-04-07 15:05:47 +02:00
parent 729fc9dd6d a2c67cd562
commit 885ad1b720
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionMessage.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -300,7 +300,7 @@ public final class ConditionMessage {
return new ConditionMessage(ConditionMessage.this, this.condition); return new ConditionMessage(ConditionMessage.this, this.condition);
} }
return new ConditionMessage(ConditionMessage.this, return new ConditionMessage(ConditionMessage.this,
this.condition + (StringUtils.isEmpty(this.condition) ? "" : " ") + reason); StringUtils.isEmpty(this.condition) ? reason : this.condition + " " + reason);
} }
} }