apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-17 11:04:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

lockRow doesn't work without transaction, start transaction before lockRow

Browse Source
This commit is contained in:
Anthony Xu 2013-05-29 15:48:23 -07:00
parent 354d259d55
commit a8bb62c35c
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2614,7 +2614,7 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L
public boolean shutdownNetwork(long networkId, ReservationContext context, boolean cleanupElements) { public boolean shutdownNetwork(long networkId, ReservationContext context, boolean cleanupElements) {
boolean result = false; boolean result = false;
Transaction txn = Transaction.currentTxn(); Transaction txn = Transaction.currentTxn();
txn.start();
NetworkVO network = _networksDao.lockRow(networkId, true); NetworkVO network = _networksDao.lockRow(networkId, true);
if (network == null) { if (network == null) {
s_logger.debug("Unable to find network with id: " + networkId); s_logger.debug("Unable to find network with id: " + networkId);
@ -2625,7 +2625,6 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L
return false; return false;
} }
txn.start();
if (isSharedNetworkWithServices(network)) { if (isSharedNetworkWithServices(network)) {
network.setState(Network.State.Shutdown); network.setState(Network.State.Shutdown);
_networksDao.update(network.getId(), network); _networksDao.update(network.getId(), network);