1 files changed, 5 insertions, 0 deletions
diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/ConfigurationUtils.java b/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/ConfigurationUtils.java
index 889efea3da..26ab2fecc8 100644
--- a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/ConfigurationUtils.java
+++ b/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/ConfigurationUtils.java
@@ -489,6 +489,11 @@ public class ConfigurationUtils {
    */
   public static boolean executeDdlSql(String sql) throws Exception {
     DataSource datasource = ConfigurationDataSource.lookup();
+    if (datasource == null) {
+      System.err.println("DB configuration not found. Configuration management will be using "
+          + "in-memory persistence.");
+      return false;
+    }
     try (Connection con = datasource.getConnection(); Statement stmt = con.createStatement()) {
       stmt.executeQuery(sql);
     } catch (Exception exception) {