aboutsummaryrefslogtreecommitdiffstats
path: root/adapters
diff options
context:
space:
mode:
authorRob Daugherty <rd472p@att.com>2018-12-05 19:03:08 +0000
committerGerrit Code Review <gerrit@onap.org>2018-12-05 19:03:08 +0000
commit03b31bd484e2a46da210f0b2d31b1d5447b41952 (patch)
tree2e30a3d761958e156a68612906200a7a9537907f /adapters
parent3b22842f0065b5fb3b8bc28974f974646d4b46cc (diff)
parent2bb9251043b543bb5005b7cf9af6ac4f58a0f733 (diff)
Merge "Resolve Security Exploits"
Diffstat (limited to 'adapters')
-rw-r--r--adapters/mso-openstack-adapters/src/main/java/db/migration/R__CloudConfigMigration.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/adapters/mso-openstack-adapters/src/main/java/db/migration/R__CloudConfigMigration.java b/adapters/mso-openstack-adapters/src/main/java/db/migration/R__CloudConfigMigration.java
index 10dbbf1396..6339616803 100644
--- a/adapters/mso-openstack-adapters/src/main/java/db/migration/R__CloudConfigMigration.java
+++ b/adapters/mso-openstack-adapters/src/main/java/db/migration/R__CloudConfigMigration.java
@@ -36,6 +36,7 @@ import org.onap.so.logger.MsoLogger;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.file.Paths;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -68,9 +69,11 @@ public class R__CloudConfigMigration implements JdbcMigration , MigrationInfoPro
// Try the override file
String configLocation = System.getProperty("spring.config.location");
if (configLocation != null) {
- try (InputStream stream = new FileInputStream(configLocation)) {
+ try (InputStream stream = new FileInputStream(Paths.get(configLocation).normalize().toString())) {
cloudConfig = loadCloudConfig(stream);
- }
+ }catch(Exception e){
+ LOGGER.warnSimple("Error Loading override.yaml",e);
+ }
}
if (cloudConfig == null) {