From c6dc4f8435bbd6e44690e7ddc04f913692303d9e Mon Sep 17 00:00:00 2001
From: Alex Huang <alex.huang@citrix.com>
Date: Wed, 16 Nov 2011 13:15:59 -0800
Subject: [PATCH] merge changes

---
 .../cloud/network/router/VirtualNetworkApplianceManagerImpl.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 8f0706d2ccb..08ace4093f9 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -1258,7 +1258,6 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
                     offering_id = _offering.getId();
                 }
                 VirtualRouterProviderType type = VirtualRouterProviderType.VirtualRouter;
-
                 Long physicalNetworkId = _networkMgr.getPhysicalNetworkId(network);
                 PhysicalNetworkServiceProvider provider = _physicalProviderDao.findByServiceProvider(physicalNetworkId, type.toString());
                 if (provider == null) {