From fe1f2824a43dd5090f6834c11809eae97f35c09b Mon Sep 17 00:00:00 2001
From: abhishek <abhishek@cloud.com>
Date: Sat, 13 Nov 2010 09:27:53 -0800
Subject: [PATCH] bug 7172: this npe occurs when we try and delete rules on a
 router which does not exist. fixing the same. status 7172: resolved fixed

---
 server/src/com/cloud/network/NetworkManagerImpl.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 0e7adaf5c22..ecd7b06ad02 100644
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -1401,11 +1401,13 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager
         }
 
         final DomainRouterVO router = _routerDao.findBy(ipVO.getAccountId(), ipVO.getDataCenterId());
-        Long hostId = router.getHostId();
+
         if (router == null || router.getHostId() == null) {
         	return true;
         }
         
+        Long hostId = router.getHostId();        
+        
         if (rule.isForwarding()) {
             return updatePortForwardingRule(rule, router, hostId, oldPrivateIP, oldPrivatePort);
         } else {