From 5426b1487c1128c73f87dab451385c03cb70b531 Mon Sep 17 00:00:00 2001 From: alena Date: Fri, 19 Nov 2010 17:26:12 -0800 Subject: [PATCH] listPortForwardingRules: return empty response instead of throwing exception when ipAddress doesn't have any rules assigned. --- server/src/com/cloud/network/NetworkManagerImpl.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 8a077dc02d9..beede7d1bff 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -1128,9 +1128,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag if ((addrOwner != null) && !_domainDao.isChildDomain(account.getDomainId(), addrOwner.getDomainId())) { throw new PermissionDeniedException("Unable to list port forwarding rules for address " + ipAddress + ", permission denied for account " + account.getId()); } - } else { - throw new InvalidParameterValueException("Unable to list port forwarding rules for address " + ipAddress + ", address not in use."); - } + } } else { if (account != null) { if ((ipAddressVO.getAccountId() == null) || (account.getId() != ipAddressVO.getAccountId().longValue())) {