Updated Branches: refs/heads/master c12a8187a -> 358f3edc5
CLOUDSTACK-2609 Fixed accoundId, domainId for the secondary ip address for shared networks Signed-off-by: Abhinandan Prateek <aprat...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/358f3edc Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/358f3edc Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/358f3edc Branch: refs/heads/master Commit: 358f3edc575b9f5ec70010316523a8edeb540d55 Parents: c12a818 Author: Jayapal <jayapalreddy.ur...@citrix.com> Authored: Tue Jun 11 11:49:34 2013 +0530 Committer: Abhinandan Prateek <aprat...@apache.org> Committed: Wed Jun 12 10:32:04 2013 +0530 ---------------------------------------------------------------------- server/src/com/cloud/network/NetworkServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/358f3edc/server/src/com/cloud/network/NetworkServiceImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java index 407bdc2..024c969 100755 --- a/server/src/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/com/cloud/network/NetworkServiceImpl.java @@ -670,8 +670,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { if (network == null) { throw new InvalidParameterValueException("Invalid network id is given"); } - accountId = network.getAccountId(); - domainId = network.getDomainId(); + accountId = ipOwner.getAccountId(); + domainId = ipOwner.getDomainId(); // Validate network offering NetworkOfferingVO ntwkOff = _networkOfferingDao.findById(network.getNetworkOfferingId());
