From aa3e8a05be8a4a06b4b925fa8e36ca3024469666 Mon Sep 17 00:00:00 2001
From: prachi <prachi@cloud.com>
Date: Wed, 18 Jan 2012 17:18:18 -0800
Subject: [PATCH] Bug 12993 - NullPointer Exception thrown when listRouters()
 is called.

Changes:
- Adding null checks.
---
 server/src/com/cloud/network/NetworkManagerImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index cbf6c48210e..b4ad57f3dca 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -3904,9 +3904,9 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
         boolean isDomRGuestOrPublicNetwork = false;
         if (vm != null) {
         	Nic nic = _nicDao.findByInstanceIdAndNetworkId(networkId, vmId);
-            if (vm.getType() == Type.User && nic.isDefaultNic()) {
+            if (vm.getType() == Type.User && nic != null && nic.isDefaultNic()) {
                 isUserVmsDefaultNetwork = true; 
-            } else if (vm.getType() == Type.DomainRouter && (ntwkOff.getTrafficType() == TrafficType.Public || ntwkOff.getTrafficType() == TrafficType.Guest)) {
+            } else if (vm.getType() == Type.DomainRouter && ntwkOff != null && (ntwkOff.getTrafficType() == TrafficType.Public || ntwkOff.getTrafficType() == TrafficType.Guest)) {
                 isDomRGuestOrPublicNetwork = true;
             }    
         }