aboutsummaryrefslogtreecommitdiffstats
path: root/adapters/mso-adapter-utils/src/main/java
diff options
context:
space:
mode:
authorRob Daugherty <rd472p@att.com>2018-05-01 15:48:21 -0400
committerRob Daugherty <rd472p@att.com>2018-05-01 20:52:13 -0400
commit0dd77e4e0e78d194d7f2839ad9d9e1348d41b432 (patch)
tree1857981874c6a1c87fe62e446fbfd63eb75e8da1 /adapters/mso-adapter-utils/src/main/java
parent19309c3514eb9cd2ec65dd9dc526c2306c80d926 (diff)
SDNC Adapter not loading properties
Somebody changed some variables from static to non-static, and this broke the CloudConfig loading logic. I changed them back. Change-Id: Id7dca76a4f0af0209ebd6cef8f3e0209c3f7a022 Issue-ID: SO-584 Signed-off-by: Rob Daugherty <rd472p@att.com>
Diffstat (limited to 'adapters/mso-adapter-utils/src/main/java')
-rw-r--r--adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudConfigFactory.java8
1 files changed, 3 insertions, 5 deletions
diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudConfigFactory.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudConfigFactory.java
index 9f6520cf7e..3281f0489c 100644
--- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudConfigFactory.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/cloud/CloudConfigFactory.java
@@ -57,13 +57,13 @@ public class CloudConfigFactory implements Serializable {
private static final long serialVersionUID = 2956662716453261085L;
- private CloudConfig cloudConfigCache = new CloudConfig();
+ private static CloudConfig cloudConfigCache = new CloudConfig();
protected static String prefixMsoPropertiesPath = System.getProperty ("mso.config.path");
private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
- private int refreshTimer;
+ private static int refreshTimer;
private static final ReentrantReadWriteLock rwl = new ReentrantReadWriteLock ();
@@ -72,7 +72,7 @@ public class CloudConfigFactory implements Serializable {
prefixMsoPropertiesPath = "";
}
}
-
+
public void initializeCloudConfig (String filePath, int refreshTimer) throws MsoCloudIdentityNotFound {
rwl.writeLock ().lock ();
try {
@@ -105,8 +105,6 @@ public class CloudConfigFactory implements Serializable {
/**
* This method is not intended to be called, it's used to refresh the config
* automatically
- *
- * @return true if Properties have been reloaded, false otherwise
*/
@Schedule(minute = "*/1", hour = "*", persistent = false)
public void reloadCloudConfig () {