From dfbe11355c40a5dbe022f022426c100c53428901 Mon Sep 17 00:00:00 2001
From: Mice Xia <mice_xia@tcloudcomputing.com>
Date: Thu, 18 Apr 2013 14:56:44 +0800
Subject: [PATCH] fix CLOUDSTACK-2061 Hitting java NPE in
 addNicToVirtualMachine api when trying to add a shared network to a VM

---
 server/src/com/cloud/network/element/VirtualRouterElement.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/network/element/VirtualRouterElement.java b/server/src/com/cloud/network/element/VirtualRouterElement.java
index 169db3283e3..f601f4fa2e4 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);