aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2018-08-30 12:26:14 +0000
committerGerrit Code Review <gerrit@onap.org>2018-08-30 12:26:14 +0000
commit65e449f142c01abc878df1c8c3bd3f55beffafc4 (patch)
tree5981295fb062f5670b0516fff84cd284982120a3
parent94c5d04411a455586f7e61e707d30bdbc8515b13 (diff)
parent32813b8a9b805f26358289f28801ee8e095233b7 (diff)
Merge "handle null drools object in configuration"
-rw-r--r--policy-management/src/main/java/org/onap/policy/drools/system/PolicyControllerFactory.java6
-rw-r--r--policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java2
2 files changed, 4 insertions, 4 deletions
diff --git a/policy-management/src/main/java/org/onap/policy/drools/system/PolicyControllerFactory.java b/policy-management/src/main/java/org/onap/policy/drools/system/PolicyControllerFactory.java
index e2af0fbc..d8d4289f 100644
--- a/policy-management/src/main/java/org/onap/policy/drools/system/PolicyControllerFactory.java
+++ b/policy-management/src/main/java/org/onap/policy/drools/system/PolicyControllerFactory.java
@@ -241,9 +241,6 @@ class IndexedPolicyControllerFactory implements PolicyControllerFactory {
throw makeArgEx(name);
}
- if (droolsConfig == null)
- throw new IllegalArgumentException("Invalid Drools Configuration");
-
PolicyController controller = this.get(name);
if (controller == null) {
@@ -271,6 +268,9 @@ class IndexedPolicyControllerFactory implements PolicyControllerFactory {
if (controller == null)
throw new IllegalArgumentException("Not a valid controller: null");
+ if (droolsConfig == null)
+ throw new IllegalArgumentException("Invalid Drools Configuration");
+
if (!controller.updateDrools(droolsConfig)) {
logger.warn("Cannot update drools configuration: " + droolsConfig + " on " + this);
throw new IllegalArgumentException("Cannot update drools configuration Drools Configuration");
diff --git a/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java b/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java
index 5b8cb2f0..993c09c0 100644
--- a/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java
+++ b/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java
@@ -619,7 +619,7 @@ class PolicyEngineManager implements PolicyEngine {
for (final ControllerConfiguration configController : configControllers) {
MDCTransaction mdcTrans = MDCTransaction.newSubTransaction(null).setTargetEntity(configController.getName())
.setTargetServiceName(configController.getOperation())
- .setTargetVirtualEntity(configController.getDrools().toString());
+ .setTargetVirtualEntity(""+configController.getDrools());
try {
final PolicyController policyController = this.updatePolicyController(configController);
policyControllers.add(policyController);