You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2013/05/31 09:49:16 UTC
[18/50] [abbrv] git commit: updated refs/heads/vmware-datamodel to
6a8c2bd
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/a8bb62c3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a8bb62c3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a8bb62c3
Branch: refs/heads/vmware-datamodel
Commit: a8bb62c35cb4ed93fb8cdb257c00cea0576a08d0
Parents: 354d259
Author: Anthony Xu <an...@citrix.com>
Authored: Wed May 29 15:48:23 2013 -0700
Committer: Anthony Xu <an...@citrix.com>
Committed: Wed May 29 15:48:23 2013 -0700
----------------------------------------------------------------------
.../src/com/cloud/network/NetworkManagerImpl.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a8bb62c3/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 cc149a5..70cb14f 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -2614,7 +2614,7 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L
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) {
s_logger.debug("Unable to find network with id: " + networkId);
@@ -2625,7 +2625,6 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L
return false;
}
- txn.start();
if (isSharedNetworkWithServices(network)) {
network.setState(Network.State.Shutdown);
_networksDao.update(network.getId(), network);