2 files changed, 10 insertions, 8 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) {
diff --git a/bpmn/MSORESTClient/src/main/java/org/openecomp/mso/rest/APIResponse.java b/bpmn/MSORESTClient/src/main/java/org/openecomp/mso/rest/APIResponse.java
index dfb9f36e9a..ea9ca62bf5 100644
--- a/bpmn/MSORESTClient/src/main/java/org/openecomp/mso/rest/APIResponse.java
+++ b/bpmn/MSORESTClient/src/main/java/org/openecomp/mso/rest/APIResponse.java
@@ -21,6 +21,7 @@
 package org.openecomp.mso.rest;
 
 import java.io.IOException;
+import java.util.Arrays;
 
 import org.apache.http.Header;
 import org.apache.http.HttpResponse;
@@ -44,7 +45,7 @@ public class APIResponse {
      * @param httpResponse used to create headers
      * @return http headers
      */
-    private HttpHeader[] buildHeaders(final HttpResponse httpResponse) {
+    private static HttpHeader[] buildHeaders(final HttpResponse httpResponse) {
         final Header[] headers = httpResponse.getAllHeaders();
 
         HttpHeader[] httpHeaders = new HttpHeader[headers.length];
@@ -102,7 +103,12 @@ public class APIResponse {
      * @return http response body
      */
     public byte[] getResponseBodyAsByteArray() {
-        return this.responseBody;
+        // avoid exposing internals, create copy
+        if (this.responseBody != null) {
+            return Arrays.copyOf(this.responseBody, this.responseBody.length);
+        } else {
+            return null;
+        }
     }
 
     /**
@@ -125,11 +131,7 @@ public class APIResponse {
      */
     public HttpHeader[] getAllHeaders() {
         // avoid exposing internals, create copy
-        HttpHeader[] copy = new HttpHeader[this.headers.length];
-        for (int i = 0; i < this.headers.length; ++i) {
-            copy[i] = headers[i];
-        }
-        return copy;
+        return Arrays.copyOf(this.headers, this.headers.length);
     }
 
     public String getFirstHeader(String name) {