From f95b0edaff79d38c1a46402df6ef1b650bf58f6b Mon Sep 17 00:00:00 2001
From: Rohit Yadav <bhaisaab@apache.org>
Date: Thu, 7 Feb 2013 11:08:28 +0530
Subject: [PATCH] CLOUDSTACK-1181: Fix NPE, ignore if default path is not
 readable, we're passing props file anyway

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit 7c003611d04d10bae2f02f3f3b9338e166b75676)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
---
 server/src/com/cloud/upgrade/DatabaseCreator.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/upgrade/DatabaseCreator.java b/server/src/com/cloud/upgrade/DatabaseCreator.java
index 99e63a673c0..4d706344707 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