This commit is contained in:
Stephane Nicoll
2017-04-23 12:08:24 +02:00
parent b086838df3
commit 7a676095a0

View File

@@ -97,8 +97,8 @@ public abstract class ServiceCapability<T> implements Cloneable {
*/ */
public void merge(ServiceCapability<T> other) { public void merge(ServiceCapability<T> other) {
Assert.notNull(other, "Other must not be null"); Assert.notNull(other, "Other must not be null");
Assert.state(this.id.equals(other.id)); Assert.isTrue(this.id.equals(other.id), "Ids must be equals");
Assert.state(this.type.equals(other.type)); Assert.isTrue(this.type.equals(other.type), "Types must be equals");
if (StringUtils.hasText(other.title)) { if (StringUtils.hasText(other.title)) {
this.title = other.title; this.title = other.title;
} }