From 9022ab5bc979948bf414963c2ffe19c1d06cdb48 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@citrix.com>
Date: Mon, 12 Mar 2012 11:59:52 -0700
Subject: [PATCH] bug 14074: Specify networkId for list public ip

status 14074: resolved fixed
---
 .../network/router/VirtualNetworkApplianceManagerImpl.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 3177b12df06..80c980801fe 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -1805,7 +1805,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
             long ownerId = router.getAccountId();
             long zoneId = router.getDataCenterIdToDeployIn();
 
-            final List<IPAddressVO> userIps = _networkMgr.listPublicIpAddressesInVirtualNetwork(ownerId, zoneId, null, null);
+            final List<IPAddressVO> userIps = _networkMgr.listPublicIpAddressesInVirtualNetwork(ownerId, zoneId, null, networkId);
             List<PublicIp> allPublicIps = new ArrayList<PublicIp>();
             if (userIps != null && !userIps.isEmpty()) {
                 for (IPAddressVO userIp : userIps) {