cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [14/31] git commit: updated refs/heads/ui-mixed-zone-management to e044303
Date Thu, 18 Apr 2013 22:19:11 GMT
fix CLOUDSTACK-2061 Hitting java NPE in addNicToVirtualMachine api when trying to add a shared
network to a VM


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dfbe1135
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dfbe1135
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dfbe1135

Branch: refs/heads/ui-mixed-zone-management
Commit: dfbe11355c40a5dbe022f022426c100c53428901
Parents: 985b2aa
Author: Mice Xia <mice_xia@tcloudcomputing.com>
Authored: Thu Apr 18 14:56:44 2013 +0800
Committer: Mice Xia <mice_xia@tcloudcomputing.com>
Committed: Thu Apr 18 14:57:37 2013 +0800

----------------------------------------------------------------------
 .../network/element/VirtualRouterElement.java      |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dfbe1135/server/src/com/cloud/network/element/VirtualRouterElement.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/element/VirtualRouterElement.java b/server/src/com/cloud/network/element/VirtualRouterElement.java
index 169db32..f601f4f 100755
--- a/server/src/com/cloud/network/element/VirtualRouterElement.java
+++ b/server/src/com/cloud/network/element/VirtualRouterElement.java
@@ -876,8 +876,8 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl
         if (publicNetwork) {
             routers = _routerDao.listByNetworkAndRole(network.getId(), Role.VIRTUAL_ROUTER);
         } else {
-            Long podId = dest.getPod().getId();
             if (isPodBased) {
+                Long podId = dest.getPod().getId();
                 routers = _routerDao.listByNetworkAndPodAndRole(network.getId(), podId, Role.VIRTUAL_ROUTER);
             } else {
                 routers = _routerDao.listByNetworkAndRole(network.getId(), Role.VIRTUAL_ROUTER);


Mime
View raw message