diff options
| author |   Mike Babinski <mb1915@att.com> | 2017-08-31 05:15:13 +0000 |
|---|---|---|
| committer | Mike Babinski <mb1915@att.com> | 2017-08-31 05:17:59 +0000 |
| commit | 71e1534a5b93392ed484e9c291aa5fe7d4cb75ba (patch) | |
| tree | ba376bdf40ff649ea2f10dfe1ef0dc2fe74ad2f8 | |
| parent | 3cc999671adbaccb179b4a260c2b6b6faa913080 (diff) | |
Fix Sonar Blockers for Drools-Applications
Issue-ID: POLICY-111
Add null check for pipResponse right before null check of pipResponse.gitAttributes().
Change-Id: Iba52791da1aae6900ab4dd4bb6286c3ac00e00a4
Signed-off-by: Mike Babinski <mb1915@att.com>
| -rw-r--r-- | controlloop/common/guard/src/main/java/org/onap/policy/guard/PIPEngineGetHistory.java | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/controlloop/common/guard/src/main/java/org/onap/policy/guard/PIPEngineGetHistory.java b/controlloop/common/guard/src/main/java/org/onap/policy/guard/PIPEngineGetHistory.java index 9e8ed9db0..9382203d1 100644 --- a/controlloop/common/guard/src/main/java/org/onap/policy/guard/PIPEngineGetHistory.java +++ b/controlloop/common/guard/src/main/java/org/onap/policy/guard/PIPEngineGetHistory.java @@ -185,21 +185,19 @@ public class PIPEngineGetHistory extends StdConfigurableEngine{ try { pipResponse = pipFinder.getMatchingAttributes(pipRequest, this); - if (pipResponse != null) { - if (pipResponse.getStatus() != null && !pipResponse.getStatus().isOk()) { + if ((pipResponse != null) + && (pipResponse.getStatus() != null) + && (!pipResponse.getStatus().isOk())) { logger.warn("Error retrieving {}: {}", pipRequest.getAttributeId().stringValue(), pipResponse.getStatus().toString()); pipResponse = null; - } - if (pipResponse.getAttributes() != null && pipResponse.getAttributes().isEmpty()) { + } + if ((pipResponse != null) + && (pipResponse.getAttributes() != null) + && (pipResponse.getAttributes().isEmpty())) { logger.warn("Error retrieving {}: {}", pipRequest.getAttributeId().stringValue(), pipResponse.getStatus().toString()); logger.warn("Error retrieving {}: {}", pipRequest.getAttributeId().stringValue(), pipResponse.getStatus()); pipResponse = null; } - if (pipResponse.getAttributes() != null && pipResponse.getAttributes().isEmpty()) { - logger.warn("Error retrieving {}: {}", pipRequest.getAttributeId().stringValue(), pipResponse.getStatus()); - pipResponse = null; - } - } } catch (PIPException ex) { logger.error("getAttribute threw:", ex); } |