From ab126289257448102b2f784b3a5298b192a71d53 Mon Sep 17 00:00:00 2001
From: Vijayendra Bhamidipati <vijayendra.bhamidipati@citrix.com>
Date: Tue, 22 May 2012 19:10:47 -0700
Subject: [PATCH] CS-15055: DB exception when creating n1kv VSM when adding a
 cluster via the latest management server GUI.

Description:

	Missed a check for Null pointer.
---
 server/src/com/cloud/resource/ResourceManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
index a67a834edd0..c27b88f535f 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -415,7 +415,7 @@ public class ResourceManagerImpl implements ResourceManager, ResourceService, Ma
         clusterId = cluster.getId();
         result.add(cluster);
         
-        if (cmd.getAddVSMFlag().equalsIgnoreCase("true")) {
+        if (cmd.getAddVSMFlag() != null && cmd.getAddVSMFlag().equalsIgnoreCase("true")) {
 
         	String vsmIp = cmd.getVSMIpaddress();
         	String vsmUser = cmd.getVSMUsername();