From 32813b8a9b805f26358289f28801ee8e095233b7 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Wed, 29 Aug 2018 17:15:37 -0400 Subject: handle null drools object in configuration Modified code to explicitly check for missing drools object, and to not throw an exception during MDC setup. Change-Id: Iac16f2fc46e2ffff03195985383b09b814fa4008 Issue-ID: POLICY-1082 Signed-off-by: Jim Hahn --- .../java/org/onap/policy/drools/system/PolicyControllerFactory.java | 6 +++--- .../src/main/java/org/onap/policy/drools/system/PolicyEngine.java | 2 +- 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); -- cgit 1.2.3-korg