From 50244b79ab955ace4f0101a2beaf21e4f841e3cd Mon Sep 17 00:00:00 2001
From: prachi <prachi@cloud.com>
Date: Wed, 23 Mar 2011 22:20:53 -0700
Subject: [PATCH] Zone check in createNetwork for Bug 6873 - disable/enable
 mode for clusters (and pods and zones and hosts)

---
 server/src/com/cloud/network/NetworkManagerImpl.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 04b8d4f7714..0184cbec094 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -1463,9 +1463,12 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
         }
         
         // Check if zone exists
-		DataCenterVO zone = _dcDao.findById(zoneId);
+        if (zoneId == null) {
+            throw new InvalidParameterValueException("Please specify a valid zone.");
+        }
 
-        if (zoneId == null || zone == null) {
+		DataCenterVO zone = _dcDao.findById(zoneId);
+        if (zone == null) {
             throw new InvalidParameterValueException("Please specify a valid zone.");
         }