From 09e7ab9750df27d96159bbcf3f41bafc33ac6fbe Mon Sep 17 00:00:00 2001
From: Wei Zhou <w.zhou@leaseweb.com>
Date: Thu, 7 Nov 2013 11:07:24 +0100
Subject: [PATCH] CLOUDSTACK-5042: fix NPE error as BroadcastUri is NULL in
 shared network after upgrade from 2.2.14

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

diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 9c4f7778da9..1e278ef22c0 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -4505,7 +4505,10 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L
     			//nic.setBroadcastType(BroadcastDomainType.Vlan);
     			//nic.setBroadcastUri(BroadcastDomainType.Vlan.toUri(ip.getVlanTag()));
     			nic.setBroadcastType(network.getBroadcastDomainType());
-    			nic.setBroadcastUri(network.getBroadcastUri());
+    			if (network.getBroadcastUri() != null)
+    			    nic.setBroadcastUri(network.getBroadcastUri());
+    			else
+    			    nic.setBroadcastUri(BroadcastDomainType.Vlan.toUri(ip.getVlanTag()));
     			nic.setFormat(AddressFormat.Ip4);
     			nic.setReservationId(String.valueOf(ip.getVlanTag()));
     			nic.setMacAddress(ip.getMacAddress());