merge changes

This commit is contained in:
Alex Huang 2011-11-16 13:15:59 -08:00
parent 84d5f0514e
commit c6dc4f8435
1 changed files with 0 additions and 1 deletions

View File

@ -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) {