From ad3c18a46cf079ad52b2eaaa0a65aef50f0a039e Mon Sep 17 00:00:00 2001
From: kishan <kishan@cloud.com>
Date: Fri, 29 Oct 2010 16:18:08 +0530
Subject: [PATCH] bug 6789: release router lock after commiting transaction
 status 6789: resolved fixed

---
 server/src/com/cloud/vm/UserVmManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 116acf1b741..8f1c70f0ff3 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -1511,11 +1511,11 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, VirtualM
                 );
             userVm.setGuestMacAddress(vmMacAddress);
         	_vmDao.update(userVm.getId(), userVm);
+        	txn.commit();
         	if (routerLock) {
         		_routerDao.release(routerId);
         		routerLock = false;
         	}
-        	txn.commit();
         	return ipAddressStr;
         }finally {
         	if (routerLock) {