From 37f4a120fdb719e595d554ded6f659245796b15e 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

---
 .../cloudstack/engine/orchestration/NetworkOrchestrator.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
index cd32e8c21db..d8c3b8e5132 100755
--- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@ -1535,6 +1535,10 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
     }
 
     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);