You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2013/02/07 06:40:16 UTC
git commit: refs/heads/master - CLOUDSTACK-1181: Fix NPE,
ignore if default path is not readable, we're passing props file anyway
Updated Branches:
refs/heads/master d44d4b76e -> 7c003611d
CLOUDSTACK-1181: Fix NPE, ignore if default path is not readable, we're passing props file anyway
Signed-off-by: Rohit Yadav <bh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7c003611
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7c003611
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7c003611
Branch: refs/heads/master
Commit: 7c003611d04d10bae2f02f3f3b9338e166b75676
Parents: d44d4b7
Author: Rohit Yadav <bh...@apache.org>
Authored: Thu Feb 7 11:08:28 2013 +0530
Committer: Rohit Yadav <bh...@apache.org>
Committed: Thu Feb 7 11:09:56 2013 +0530
----------------------------------------------------------------------
server/src/com/cloud/upgrade/DatabaseCreator.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7c003611/server/src/com/cloud/upgrade/DatabaseCreator.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/upgrade/DatabaseCreator.java b/server/src/com/cloud/upgrade/DatabaseCreator.java
index 99e63a6..4d70634 100755
--- a/server/src/com/cloud/upgrade/DatabaseCreator.java
+++ b/server/src/com/cloud/upgrade/DatabaseCreator.java
@@ -156,7 +156,10 @@ public class DatabaseCreator {
System.exit(1);
}
- Transaction.initDataSource(dbPropsFile);
+ try {
+ Transaction.initDataSource(dbPropsFile);
+ } catch (NullPointerException e) {
+ }
initDB(dbPropsFile, rootPassword, databases, dryRun);
// Process sql files