cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ko...@apache.org
Subject git commit: updated refs/heads/master to 0e3fde5
Date Tue, 25 Feb 2014 20:55:20 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 80738cce0 -> 0e3fde510


replace String != operation with .equals

replaced the != operation performed on two String objects with ObjectUtils.equals

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0e3fde51
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0e3fde51
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0e3fde51

Branch: refs/heads/master
Commit: 0e3fde5107b5e66bb749d1d86b8d7198c1c2ba0a
Parents: 80738cc
Author: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Authored: Tue Feb 25 20:55:35 2014 +0100
Committer: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Committed: Tue Feb 25 21:54:32 2014 +0100

----------------------------------------------------------------------
 server/src/com/cloud/resource/ResourceManagerImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0e3fde51/server/src/com/cloud/resource/ResourceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
index 79eb1cb..adad85c 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


Mime
View raw message