From 8caedad524f0fd850cfe7dcb7911af0e7115de60 Mon Sep 17 00:00:00 2001 From: Temoc Rodriguez Date: Tue, 10 Oct 2017 15:26:10 -0700 Subject: Fix nullPointerException non-200 guard response. Added a check for when the guard response from pdp-x is not 200. When the response is unauthorized or forbidden, it will have an empty body, try to convert to json, and throw an exception. Added a null check on the response and returns indeterminate in the case of an empty body. Issue-ID: POLICY-280 Change-Id: I9d384472e230495130bd41d377e25b74fe9ea9bd Signed-off-by: Temoc Rodriguez --- .../java/org/onap/policy/guard/PolicyGuardXacmlHelper.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'controlloop') diff --git a/controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardXacmlHelper.java b/controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardXacmlHelper.java index 908a3aff9..0ecfaa6c4 100644 --- a/controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardXacmlHelper.java +++ b/controlloop/common/guard/src/main/java/org/onap/policy/guard/PolicyGuardXacmlHelper.java @@ -231,12 +231,13 @@ public class PolicyGuardXacmlHelper { } catch (Exception e) { logger.error( "Exception in 'PolicyGuardXacmlHelper.callRESTfulPDP'", e); - // - // Connection may have failed, return Indeterminate - // - if(response == null || response.isEmpty()){ - return Util.INDETERMINATE; - } + } + + // + // Connection may have failed or not been 200 OK, return Indeterminate + // + if(response == null || response.isEmpty()){ + return Util.INDETERMINATE; } rawDecision = new JSONObject(response).getString("decision"); -- cgit 1.2.3-korg