From 0e3fde5107b5e66bb749d1d86b8d7198c1c2ba0a Mon Sep 17 00:00:00 2001 From: Laszlo Hornyak Date: Tue, 25 Feb 2014 20:55:35 +0100 Subject: [PATCH] replace String != operation with .equals replaced the != operation performed on two String objects with ObjectUtils.equals Signed-off-by: Laszlo Hornyak --- server/src/com/cloud/resource/ResourceManagerImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java index 79eb1cbee0b..adad85ca8a6 100755 --- a/server/src/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/com/cloud/resource/ResourceManagerImpl.java @@ -50,6 +50,7 @@ import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.apache.cloudstack.utils.identity.ManagementServerNode; +import org.apache.commons.lang.ObjectUtils; import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; @@ -1892,7 +1893,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, // If the server's private IP is the same as is public IP, this host has // a host-only private network. Don't check for conflicts with the // private IP address table. - if (serverPrivateIP != serverPublicIP) { + if (!ObjectUtils.equals(serverPrivateIP, serverPublicIP)) { if (!_privateIPAddressDao.mark(dc.getId(), pod.getId(), serverPrivateIP)) { // If the server's private IP address is already in the // database, return false