cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anthon...@apache.org
Subject git commit: updated refs/heads/master to c0936fe
Date Thu, 22 May 2014 22:55:58 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 35d5621bd -> c0936fecb


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/c0936fec
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c0936fec
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c0936fec

Branch: refs/heads/master
Commit: c0936fecbc76e5b825b2bf95f42125511611b8ca
Parents: 35d5621
Author: Anthony Xu <anthony.xu@citrix.com>
Authored: Thu May 22 15:46:48 2014 -0700
Committer: Anthony Xu <anthony.xu@citrix.com>
Committed: Thu May 22 15:47:28 2014 -0700

----------------------------------------------------------------------
 .../network/router/VpcVirtualNetworkApplianceManagerImpl.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c0936fec/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 1f13334..431806b 100644
--- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
@@ -1267,7 +1267,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(


Mime
View raw message