summaryrefslogtreecommitdiffstats
path: root/a1-policy-management
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2022-11-30 19:58:54 +0000
committerGerrit Code Review <gerrit@onap.org>2022-11-30 19:58:54 +0000
commit201eb4494467c84ce5ae3f446b95add838a1928b (patch)
treeed236c25d4c8ab704158ba19fed4fbd2f220c8ae /a1-policy-management
parentbf67bc5ff50876f240b835c16c1a8c719841df1b (diff)
parent21e27049544ddf0a30a839c968e21b6f877b729c (diff)
Merge "Support for using Amazon S3 - Cloud Object Storage"
Diffstat (limited to 'a1-policy-management')
-rw-r--r--a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/repository/Policies.java2
-rw-r--r--a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RefreshConfigTask.java4
2 files changed, 2 insertions, 4 deletions
diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/repository/Policies.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/repository/Policies.java
index d808b57d..09f59ca4 100644
--- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/repository/Policies.java
+++ b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/repository/Policies.java
@@ -101,7 +101,7 @@ public class Policies {
policiesRic.put(policy.getRic().id(), policy.getId(), policy);
policiesService.put(policy.getOwnerServiceId(), policy.getId(), policy);
policiesType.put(policy.getType().getId(), policy.getId(), policy);
- if (this.appConfig.getVardataDirectory() != null && !policy.isTransient()) {
+ if (!policy.isTransient()) {
store(policy);
}
}
diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RefreshConfigTask.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RefreshConfigTask.java
index 567bb8d2..408a0d5f 100644
--- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RefreshConfigTask.java
+++ b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RefreshConfigTask.java
@@ -200,9 +200,7 @@ public class RefreshConfigTask {
void addRic(Ric ric) {
this.rics.put(ric);
- if (this.appConfig.getVardataDirectory() != null) {
- this.policies.restoreFromDatabase(ric, this.policyTypes).subscribe();
- }
+ this.policies.restoreFromDatabase(ric, this.policyTypes).subscribe();
logger.debug("Added RIC: {}", ric.id());
}