From ffb8d54dff7b1c4fca2565d54e0aaad13c402d5d Mon Sep 17 00:00:00 2001 From: abhishek Date: Fri, 7 Jan 2011 16:49:51 -0800 Subject: [PATCH] changing a few obsolete names to std convention --- .../network/security/SecurityGroupManagerImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java index 03da264a106..7d92f5c1f2c 100644 --- a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java +++ b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java @@ -1082,16 +1082,16 @@ public class SecurityGroupManagerImpl implements SecurityGroupManager, SecurityG s_logger.warn("Failed to acquire lock on user vm id=" + userVmId); } try { - for (SecurityGroupVO networkGroup:uniqueGroups) { + for (SecurityGroupVO securityGroup:uniqueGroups) { //don't let the group be deleted from under us. - SecurityGroupVO ngrpLock = _securityGroupDao.lockRow(networkGroup.getId(), false); + SecurityGroupVO ngrpLock = _securityGroupDao.lockRow(securityGroup.getId(), false); if (ngrpLock == null) { - s_logger.warn("Failed to acquire lock on network group id=" + networkGroup.getId() + " name=" + networkGroup.getName()); + s_logger.warn("Failed to acquire lock on network group id=" + securityGroup.getId() + " name=" + securityGroup.getName()); txn.rollback(); return false; } - if (_securityGroupVMMapDao.findByVmIdGroupId(userVmId, networkGroup.getId()) == null) { - SecurityGroupVMMapVO groupVmMapVO = new SecurityGroupVMMapVO(networkGroup.getId(), userVmId); + if (_securityGroupVMMapDao.findByVmIdGroupId(userVmId, securityGroup.getId()) == null) { + SecurityGroupVMMapVO groupVmMapVO = new SecurityGroupVMMapVO(securityGroup.getId(), userVmId); _securityGroupVMMapDao.persist(groupVmMapVO); } }