You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2012/05/28 00:30:43 UTC
[14/50] git commit: CS-15055: DB exception when creating n1kv VSM
when adding a cluster via the latest management server GUI.
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.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/6920d769
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6920d769
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6920d769
Branch: refs/heads/master
Commit: 6920d7699532cf17a43a4ef87d0a401c363cfc04
Parents: 82ffddc
Author: Vijayendra Bhamidipati <vi...@citrix.com>
Authored: Tue May 22 19:10:47 2012 -0700
Committer: Vijayendra Bhamidipati <vi...@citrix.com>
Committed: Fri May 25 18:28:25 2012 -0700
----------------------------------------------------------------------
.../com/cloud/resource/ResourceManagerImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6920d769/server/src/com/cloud/resource/ResourceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
index 22700fc..4add897 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -431,7 +431,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();