From 1b96d7fe34a8bf9be91a5041e63e37141e996489 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Tue, 11 Apr 2017 11:24:16 -0700 Subject: Fix logic error in HealthCheckHandler Change-Id: I0d67ad98e2e9b409774532715da3959e47e27d13 Signed-off-by: Gary Wu --- .../src/main/java/org/openecomp/mso/bpmn/core/HealthCheckHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2edbc99..409297c 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) { -- cgit 1.2.3-korg