Fixing Merge error
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/434c21a1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/434c21a1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/434c21a1 Branch: refs/heads/javelin Commit: 434c21a14929d5b41048d002b0cc7b8a1a2b28cf Parents: 02185d4 Author: Prachi Damle <[email protected]> Authored: Fri Jan 18 16:22:25 2013 -0800 Committer: Prachi Damle <[email protected]> Committed: Tue Jan 22 12:54:18 2013 -0800 ---------------------------------------------------------------------- .../router/VirtualNetworkApplianceManagerImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/434c21a1/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index d15d25f..ac3f924 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -3254,7 +3254,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian if (rules != null) { rulesTO = new ArrayList<FirewallRuleTO>(); for (FirewallRule rule : rules) { - IpAddress sourceIp = _networkMgr.getIp(rule.getSourceIpAddressId()); + IpAddress sourceIp = _networkModel.getIp(rule.getSourceIpAddressId()); if (rule.getSourceCidrList() == null && (rule.getPurpose() == Purpose.Firewall || rule.getPurpose() == Purpose.NetworkACL)) { _rulesDao.loadSourceCidrs((FirewallRuleVO)rule); }
