From ef41ebc9eceeaaca2f600a1f50130b8834106a95 Mon Sep 17 00:00:00 2001
From: kishan <kishan@cloud.com>
Date: Wed, 18 Aug 2010 13:54:53 +0530
Subject: [PATCH] Check for null vnet when allocation fails

---
 server/src/com/cloud/network/NetworkManagerImpl.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
 mode change 100755 => 100644 server/src/com/cloud/network/NetworkManagerImpl.java

diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
old mode 100755
new mode 100644
index a37b3376cb6..8a1ea05b800
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -880,7 +880,9 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager
 	                    vnet = _dcDao.allocateVnet(router.getDataCenterId(), router.getAccountId());
 	                }
 	                vnetAllocated = true;
-	                routerMacAddress = getRouterMacForVnet(dc, vnet);
+	                if(vnet != null){
+	                    routerMacAddress = getRouterMacForVnet(dc, vnet);
+	                }
 	            } else if (router.getRole() == Role.DHCP_USERDATA) {
 	            	if (!Vlan.UNTAGGED.equals(router.getVlanId())) {
 	            		vnet = router.getVlanId().trim();