Fix logic error in HealthCheckHandler 05/5305/1
authorGary Wu <gary.i.wu@huawei.com>
Tue, 11 Apr 2017 18:24:16 +0000 (11:24 -0700)
committerGary Wu <gary.i.wu@huawei.com>
Tue, 11 Apr 2017 18:24:16 +0000 (11:24 -0700)
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

index 2edbc99..409297c 100644 (file)
@@ -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) {