summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Closset <cc697w@intl.att.com>2017-05-02 09:14:11 +0000
committerGerrit Code Review <gerrit@onap.org>2017-05-02 09:14:11 +0000
commitae44e6134b551fb55c46c1b576e991270b5c295b (patch)
treee3ae174b1c068a1df3fe9dd124287647e8e7b7a7
parent87ecc7ad8d6b95ed40b6e9e176605be752a923aa (diff)
parent1b96d7fe34a8bf9be91a5041e63e37141e996489 (diff)
Merge "Fix logic error in HealthCheckHandler"
-rw-r--r--bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/HealthCheckHandler.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/HealthCheckHandler.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/HealthCheckHandler.java
index 2edbc99a77..409297c927 100644
--- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/HealthCheckHandler.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/HealthCheckHandler.java
@@ -215,7 +215,7 @@ public class HealthCheckHandler {
private String decrypt(String encryptedString, String key){
try {
- if (encryptedString != null || !encryptedString.isEmpty() && key != null && !key.isEmpty()) {
+ if (encryptedString != null && !encryptedString.isEmpty() && key != null && !key.isEmpty()) {
return CryptoUtils.decrypt(encryptedString, key);
}
} catch (Exception e) {