etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use a dedicated account object for locking test, so that when we run into SQL exception, we won't accidently release a lock that we haven't actually acquired. This will cause NPE exception in Merovingian.java

This commit is contained in:
Kelven Yang 2010-08-17 17:39:05 -07:00
parent 40d71ea6de
commit a4f3dacd26
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/src/com/cloud/network/NetworkManagerImpl.java
View File

@ -221,6 +221,9 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager
final long accountId = account.getId();
// use a dedicated account object for locking test, so that when we get SQL exception
// we won't be misled to release an actually un-owned lock
AccountVO lockedAccount = null;
Transaction txn = Transaction.currentTxn();
try {
final EventVO event = new EventVO();
@ -230,8 +233,8 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager
txn.start();
account = _accountDao.acquire(accountId);
if (account == null) {
lockedAccount = _accountDao.acquire(accountId);
if (lockedAccount == null) {
s_logger.warn("Unable to lock account " + accountId);
return null;
}
@ -339,7 +342,7 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager
txn.commit();
return null;
} finally {
if (account != null) {
if (lockedAccount != null) {
if(s_logger.isDebugEnabled())
s_logger.debug("Releasing lock account " + accountId);