You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2013/06/26 11:30:17 UTC
[07/25] git commit: updated refs/heads/advancedsg-leaseweb to c5383c8
lockRow doesn't work without transaction, start transaction before lockRow
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cc9b60f9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cc9b60f9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cc9b60f9
Branch: refs/heads/advancedsg-leaseweb
Commit: cc9b60f946b0ab9e38a77f026b23668e7f60265b
Parents: 5707f90
Author: Wei Zhou <w....@leaseweb.com>
Authored: Tue Jun 11 11:06:04 2013 +0200
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Tue Jun 11 11:06:04 2013 +0200
----------------------------------------------------------------------
server/src/com/cloud/network/NetworkManagerImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cc9b60f9/server/src/com/cloud/network/NetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 68de7a1..72f5613 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -2059,6 +2059,8 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L
@DB
public boolean shutdownNetwork(long networkId, ReservationContext context, boolean cleanupElements) {
boolean result = false;
+ Transaction txn = Transaction.currentTxn();
+ txn.start();
NetworkVO network = _networksDao.lockRow(networkId, true);
if (network == null) {
@@ -2078,8 +2080,6 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L
boolean success = shutdownNetworkElementsAndResources(context, cleanupElements, network);
- Transaction txn = Transaction.currentTxn();
- txn.start();
if (success) {
if (s_logger.isDebugEnabled()) {
s_logger.debug("Network id=" + networkId + " is shutdown successfully, cleaning up corresponding resources now.");