You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2014/05/23 00:47:02 UTC
git commit: updated refs/heads/4.4-forward to 4020792
Repository: cloudstack
Updated Branches:
refs/heads/4.4-forward 120da605b -> 40207929f
fixed a typo
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/40207929
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/40207929
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/40207929
Branch: refs/heads/4.4-forward
Commit: 40207929f711d63f6b04fc18f77fd520a4975871
Parents: 120da60
Author: Anthony Xu <an...@citrix.com>
Authored: Thu May 22 15:46:48 2014 -0700
Committer: Anthony Xu <an...@citrix.com>
Committed: Thu May 22 15:46:48 2014 -0700
----------------------------------------------------------------------
.../network/router/VpcVirtualNetworkApplianceManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/40207929/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
index 8296460..c06843c 100644
--- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
@@ -1265,7 +1265,7 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian
NicProfile privateNicProfile = new NicProfile();
if (privateNic != null) {
- VirtualMachine vm = _vmDao.findById(privateNic.getId());
+ VirtualMachine vm = _vmDao.findById(privateNic.getInstanceId());
privateNicProfile =
new NicProfile(privateNic, privateNetwork, privateNic.getBroadcastUri(), privateNic.getIsolationUri(), _networkModel.getNetworkRate(
privateNetwork.getId(), vm.getId()), _networkModel.isSecurityGroupSupportedInNetwork(privateNetwork), _networkModel.getNetworkTag(