Updated Branches: refs/heads/4.1 6db11cb7d -> f95b0edaf
CLOUDSTACK-1181: Fix NPE, ignore if default path is not readable, we're passing props file anyway Signed-off-by: Rohit Yadav <[email protected]> (cherry picked from commit 7c003611d04d10bae2f02f3f3b9338e166b75676) Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f95b0eda Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f95b0eda Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/f95b0eda Branch: refs/heads/4.1 Commit: f95b0edaff79d38c1a46402df6ef1b650bf58f6b Parents: 6db11cb Author: Rohit Yadav <[email protected]> Authored: Thu Feb 7 11:08:28 2013 +0530 Committer: Rohit Yadav <[email protected]> Committed: Thu Feb 7 11:10:37 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/f95b0eda/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
