From b96aefee2fcf07f18c8259364dc68a2503ff5207 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@citrix.com>
Date: Tue, 17 Sep 2013 15:12:53 -0700
Subject: [PATCH] CLOUDSTACK-4698: Check DHCP service in the network before get
 dhcp service provider

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

diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index fb1dcb10fdd..2c00c5bebd6 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -2519,6 +2519,10 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L
     }
 
     public boolean isDhcpAccrossMultipleSubnetsSupported(Network network) {
+        if (!_networkModel.areServicesSupportedInNetwork(network.getId(), Service.Dhcp)) {
+        	return false;
+        }
+    	
         DhcpServiceProvider dhcpServiceProvider = getDhcpServiceProvider(network);
         Map <Network.Capability, String> capabilities = dhcpServiceProvider.getCapabilities().get(Network.Service.Dhcp);
         String supportsMultipleSubnets = capabilities.get(Network.Capability.DhcpAccrossMultipleSubnets);