- return (Name == null && other.getName() == null || Name != null
- && other.getName() != null && Name.equals(other.getName()))
+ return (ServiceType == null && other.getServiceType() == null
+ || ServiceType != null && other.getServiceType() != null
+ && ServiceType.equals(other.getServiceType()))
+ && (Name == null && other.getName() == null
+ || Name != null && other.getName() != null
+ && Name.equals(other.getName()))