From 0dd77e4e0e78d194d7f2839ad9d9e1348d41b432 Mon Sep 17 00:00:00 2001 From: Rob Daugherty Date: Tue, 1 May 2018 15:48:21 -0400 Subject: 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 --- .../src/main/java/org/openecomp/mso/cloud/CloudConfigFactory.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'adapters/mso-adapter-utils/src/main/java') 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 () { -- cgit 1.2.3-korg