From e278eb674e8a57b692221b95fe1d8a5781702e07 Mon Sep 17 00:00:00 2001
From: Murali reddy <Murali.Reddy@citrix.com>
Date: Mon, 20 Feb 2012 18:08:28 +0530
Subject: [PATCH] bug 13872: Implementation of Guest Network by JuniperSRX
 failed: NPE during the execution of IPAssoc Reviewed-by: Jana status 13872:
 resolved fixed

---
 core/src/com/cloud/network/resource/JuniperSrxResource.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/com/cloud/network/resource/JuniperSrxResource.java b/core/src/com/cloud/network/resource/JuniperSrxResource.java
index 1fc5b1e9eef..3d680c29a39 100644
--- a/core/src/com/cloud/network/resource/JuniperSrxResource.java
+++ b/core/src/com/cloud/network/resource/JuniperSrxResource.java
@@ -622,7 +622,7 @@ public class JuniperSrxResource implements ServerResource {
             String guestVlanSubnet = NetUtils.getCidrSubNet(guestVlanGateway, cidrSize);    
             
             Long publicVlanTag = null;
-            if (!ip.getVlanId().equals("untagged")) {
+            if (ip.getVlanId() != null && !ip.getVlanId().equals("untagged")) {
             	try {
             		publicVlanTag = Long.parseLong(ip.getVlanId());
             	} catch (Exception e) {