From 59bdf2dd8352c29ae2628cd6388d7030727132fd Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@cloud.com>
Date: Fri, 17 Feb 2012 13:24:38 -0800
Subject: [PATCH] bug 13829: Fix NPE in ExternalFirewallDeviceManagerImpl

Reviewed-by: Edison
---
 .../com/cloud/network/ExternalFirewallDeviceManagerImpl.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java b/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
index 900ff1665e5..2e6fa9f1091 100644
--- a/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
+++ b/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
@@ -363,6 +363,11 @@ public abstract class ExternalFirewallDeviceManagerImpl extends AdapterBase impl
             }
         } else {
             ExternalFirewallDeviceVO fwDeviceVO = getExternalFirewallForNetwork(network);
+            if (fwDeviceVO == null) {
+                s_logger.warn("Network shutdown requested on external firewall element, which did not implement the network." +
+                              " Either network implement failed half way through or already network shutdown is completed.");
+                return true;
+            }
             externalFirewall = _hostDao.findById(fwDeviceVO.getHostId());
         }