1 files changed, 15 insertions, 20 deletions
diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateClosedLoopFaultController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateClosedLoopFaultController.java
index 062ed2afa..9f19e4c71 100644
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateClosedLoopFaultController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateClosedLoopFaultController.java
@@ -485,30 +485,25 @@ public class CreateClosedLoopFaultController extends RestrictedBaseController {
      * @param entity PolicyEntity
      */
     public void prePopulateClosedLoopFaultPolicyData(PolicyRestAdapter policyAdapter, PolicyEntity entity) {
-        if (policyAdapter.getPolicyData() instanceof PolicyType) {
-            PolicyType policy = (PolicyType) policyAdapter.getPolicyData();
-
-            // Set PolicyAdapter policyName, description
-            setPolicyAdapterPolicyNameAndDescription(policyAdapter, policy);
-
-            // Set PolicyAdapter JsonBodyData, timeout settings
-            setClosedLoopJsonFile(policyAdapter, entity);
+        if (! (policyAdapter.getPolicyData() instanceof PolicyType)) {
+            return;
+        }
+        PolicyType policy = (PolicyType) policyAdapter.getPolicyData();
 
-            // Get the target data under policy.
-            TargetType target = policy.getTarget();
-            if (target == null) {
-                return;
-            }
+        // Set PolicyAdapter policyName, description
+        setPolicyAdapterPolicyNameAndDescription(policyAdapter, policy);
 
-            // Under target we have AnyOFType
-            List<AnyOfType> anyOfList = target.getAnyOf();
-            if (anyOfList == null) {
-                return;
-            }
+        // Set PolicyAdapter JsonBodyData, timeout settings
+        setClosedLoopJsonFile(policyAdapter, entity);
 
-            // Set PolicyAdapter OnapNameField, riskType, riskLevel, guard, ttlDate from match attributes
-            setPolicyAdapterMatchAttributes(policyAdapter, anyOfList);
+        // Get the target data under policy.
+        TargetType target = policy.getTarget();
+        if (target == null) {
+            return;
         }
+
+        // Set PolicyAdapter OnapNameField, riskType, riskLevel, guard, ttlDate from match attributes
+        setPolicyAdapterMatchAttributes(policyAdapter, target.getAnyOf());
     }
 
     private void setPolicyAdapterMatchAttributes(PolicyRestAdapter policyAdapter, List<AnyOfType> anyOfList) {