commit 1b96d7fe34a8bf9be91a5041e63e37141e996489
author Gary Wu <gary.i.wu@huawei.com> Tue Apr 11 11:24:16 2017 -0700
committer Gary Wu <gary.i.wu@huawei.com> Tue Apr 11 11:24:16 2017 -0700
tree 8c64ded0678e66e155c8edec94bc49cedb1fbee1
parent b6b7bef8bdcad15af01ac88a038dd763ce59f68f

Fix logic error in HealthCheckHandler

Change-Id: I0d67ad98e2e9b409774532715da3959e47e27d13
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/HealthCheckHandler.java

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 @@
 
     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) {