Use Objects.equals().
diff --git a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/utils/discovery/DiscoveredService.java b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/utils/discovery/DiscoveredService.java
index d2f252c..eefbc9e 100644
--- a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/utils/discovery/DiscoveredService.java
+++ b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/utils/discovery/DiscoveredService.java
@@ -21,6 +21,7 @@
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.Objects;
/**
* This contains info about a discovered service. These objects are stored in a set in the
@@ -148,13 +149,7 @@
return false;
}
DiscoveredService other = (DiscoveredService) otherArg;
- if (serviceAddress == null)
- {
- if (other.serviceAddress != null)
- {
- return false;
- }
- } else if (!serviceAddress.equals(other.serviceAddress))
+ if (!Objects.equals(serviceAddress, other.serviceAddress))
{
return false;
}