incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prachida...@apache.org
Subject git commit: https://issues.apache.org/jira/browse/CLOUDSTACK-993
Date Thu, 17 Jan 2013 01:19:05 GMT
Updated Branches:
  refs/heads/master 975021dda -> c08d151e0


https://issues.apache.org/jira/browse/CLOUDSTACK-993

Changes:
- Introduction of maven skipped the java code that inserts the admin user. This causes the
NPE in management server while trying to find the user and also, admin user cannot login as
expected.
- Fixing the insertion of the admin user as part of startup.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c08d151e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c08d151e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c08d151e

Branch: refs/heads/master
Commit: c08d151e0572ce105b71658ea40978b66c5c0f69
Parents: 975021d
Author: Prachi Damle <prachi@cloud.com>
Authored: Wed Jan 16 17:16:48 2013 -0800
Committer: Prachi Damle <prachi@cloud.com>
Committed: Wed Jan 16 17:18:11 2013 -0800

----------------------------------------------------------------------
 .../com/cloud/server/ConfigurationServerImpl.java  |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c08d151e/server/src/com/cloud/server/ConfigurationServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java
index 5d24628..74fba89 100755
--- a/server/src/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/com/cloud/server/ConfigurationServerImpl.java
@@ -341,8 +341,8 @@ public class ConfigurationServerImpl implements ConfigurationServer {
         }
 
         // now insert the user
-        insertSql = "INSERT INTO `cloud`.`user` (id, uuid, username, account_id, firstname,
lastname, created, state) " +
-                "VALUES (" + id + ", UUID(), '" + username + "', 2, '" + firstname + "','"
+ lastname + "',now(), 'disabled')";
+        insertSql = "INSERT INTO `cloud`.`user` (id, username, password, account_id, firstname,
lastname, created, state) " +
+                "VALUES (" + id + ",'" + username + "', RAND(), 2, '" + firstname + "','"
+ lastname + "',now(), 'disabled')";
 
         txn = Transaction.currentTxn();
         try {


Mime
View raw message