Skip to content

S
spring-boot
Commit 885ad1b7 authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Merge branch '2.2.x' 

Closes gh-20868
parents 729fc9dd a2c67cd5
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionMessage.java
View file @ 885ad1b7
/* /*
* 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 { ...@@ -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);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment