From d1598e366ecd822f3d818641e4509880c56a7b44 Mon Sep 17 00:00:00 2001
From: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date: Mon, 11 Jun 2012 14:31:39 -0700
Subject: [PATCH] Release acquired lock for VPC

---
 .../com/cloud/network/NetworkManagerImpl.java |  6 +++++
 ...VpcVirtualNetworkApplianceManagerImpl.java | 26 ++++++++-----------
 wscript                                       |  2 +-
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 3f66257f032..6d48726f6fa 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -1075,6 +1075,9 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
             txn.commit();
         } finally {
             if (accountToLock != null) {
+                if (s_logger.isDebugEnabled()) {
+                    s_logger.debug("Releasing lock account " + ipOwner);
+                }
                 _accountDao.releaseFromLockTable(ipOwner.getId());
                 s_logger.debug("Associate IP address lock released");
             }
@@ -1990,6 +1993,9 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
 
                 shutdownNetwork(networkId, context, false);
             }
+            if (s_logger.isDebugEnabled()) {
+                s_logger.debug("Releasing lock for network id " + networkId);
+            }
             _networksDao.releaseFromLockTable(networkId);
         }
     }
diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
index c0632392bee..67e37d59d16 100644
--- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
@@ -19,8 +19,6 @@ import javax.ejb.Local;
 
 import org.apache.log4j.Logger;
 
-import sun.security.jca.ProviderList;
-
 import com.cloud.deploy.DataCenterDeployment;
 import com.cloud.deploy.DeployDestination;
 import com.cloud.deploy.DeploymentPlan;
@@ -91,19 +89,17 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian
         Pair<DeploymentPlan, List<DomainRouterVO>> planAndRouters = getDeploymentPlanAndRouters(vpc.getId(), dest);
         DeploymentPlan plan = planAndRouters.first();
         List<DomainRouterVO> routers = planAndRouters.second();
-        
-        //2) Return routers if exist
-        if (routers.size() >= 1) {
-            return routers;
-        }
-        
-        Long offeringId = _vpcOffDao.findById(vpc.getVpcOfferingId()).getServiceOfferingId();
-        if (offeringId == null) {
-            offeringId = _offering.getId();
-        }
-        
-        //3) Deploy Virtual Router
-        try {
+        try { 
+            //2) Return routers if exist
+            if (routers.size() >= 1) {
+                return routers;
+            }
+            
+            Long offeringId = _vpcOffDao.findById(vpc.getVpcOfferingId()).getServiceOfferingId();
+            if (offeringId == null) {
+                offeringId = _offering.getId();
+            }
+            //3) Deploy Virtual Router
             List<? extends PhysicalNetwork> pNtwks = _pNtwkDao.listByZone(vpc.getZoneId());
             
             VirtualRouterProvider vpcVrProvider = null;
diff --git a/wscript b/wscript
index d00a1ddcdfe..e77a50358ef 100644
--- a/wscript
+++ b/wscript
@@ -5,7 +5,7 @@
 # if you change 'em here, you need to change it also in cloud.spec, add a %changelog entry there, and add an entry in debian/changelog
 
 
-VERSION = '3.0.3.2012-06-11T20:32:53Z'
+VERSION = '3.0.3.2012-06-11T21:29:17Z'
 APPNAME = 'cloud'
 
 import shutil,os