Transaction: Fix NPE while reading db.properties file

yadvr · yadvr · commit 7795cfd75986 · 2013-02-05T12:35:43.000+05:30
Handle NPE while setting up data source in Transaction

- This occured as Transaction is called it would run the following which
  assumed db.properties file, which may not be in one's classpath;

        // Initialize with assumed db.properties file
        initDataSource("db.properties");
- So, while this would be logged in logs, this is ignored for DatabaseCreator's
  case. In DatabaseCreator we call initDataSource with full path anyway.

Signed-off-by: Rohit Yadav &lt;bhaisaab@apache.org&gt;
diff --git a/utils/src/com/cloud/utils/db/Transaction.java b/utils/src/com/cloud/utils/db/Transaction.java
@@ -1006,10 +1006,7 @@ public String toString() {
 
     public static void initDataSource(String propsFileName) {
         try {
-            File dbPropsFile = new File(propsFileName);
-            if (!dbPropsFile.exists()) {
-                dbPropsFile = PropertiesUtil.findConfigFile(propsFileName);
-            }
+            File dbPropsFile = PropertiesUtil.findConfigFile(propsFileName);
             final Properties dbProps;
             if (EncryptionSecretKeyChecker.useEncryption()) {
                 StandardPBEStringEncryptor encryptor = EncryptionSecretKeyChecker.getEncryptor();
@@ -1022,6 +1019,9 @@ public static void initDataSource(String propsFileName) {
             } catch (IOException e) {
                 s_logger.fatal("Unable to load db properties file, pl. check the classpath and file path configuration", e);
                 return;
+            } catch (NullPointerException e) {
+                s_logger.fatal("Unable to load and read db properties file " + propsFileName + "Error: " + e);
+                return;
             }
 
             // FIXME:  If params are missing...default them????
