diff options
| author |   seshukm <seshu.kumar.m@huawei.com> | 2017-09-27 15:50:30 +0530 |
|---|---|---|
| committer | seshukm <seshu.kumar.m@huawei.com> | 2017-09-27 17:21:10 +0530 |
| commit | 7c540729009087f9a9d018f4013d631364abfb90 (patch) | |
| tree | cd77f3f07322929cad2a5b5379c1936530d662f6 /adapters/mso-sdnc-adapter | |
| parent | 1d1979633d81c74795c9a11b7849af1b6038ba02 (diff) | |
Fixed Blocker issues.
IssueId: SO-165
Change-Id: I7c2520af9394ceb600a5a25fa9acfd095d872a1d
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
Diffstat (limited to 'adapters/mso-sdnc-adapter')
2 files changed, 3 insertions, 9 deletions
diff --git a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/impl/SDNCRestClient.java b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/impl/SDNCRestClient.java index 757ea8207d..7473950063 100644 --- a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/impl/SDNCRestClient.java +++ b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/impl/SDNCRestClient.java @@ -199,7 +199,7 @@ public class SDNCRestClient implements Runnable { //default sdncResp.setRespCode(HttpURLConnection.HTTP_INTERNAL_ERROR); String respMsg = "Error processing request to SDNC. "; - String sdncErrMsg = null; + String sdncErrMsg = ""; if (e instanceof java.net.SocketTimeoutException ) { @@ -264,9 +264,7 @@ public class SDNCRestClient implements Runnable { if (e.getMessage() != null) { respMsg = respMsg + e.getMessage(); } - if (sdncErrMsg != null) { - respMsg = respMsg + sdncErrMsg; - } + respMsg = respMsg + sdncErrMsg; sdncResp.setRespMsg(respMsg); diff --git a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/BPRestCallback.java b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/BPRestCallback.java index 0622c48c41..f6708a2586 100644 --- a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/BPRestCallback.java +++ b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/BPRestCallback.java @@ -138,12 +138,7 @@ public class BPRestCallback { LOGGER.error(MessageEnum.RA_CALLBACK_BPEL_EXC, "Camunda", "", MsoLogger.ErrorCode.BusinessProcesssError, msg); ALARMLOGGER.sendAlarm("MsoInternalError", MsoAlarmLogger.CRITICAL, msg); } - - httpResponse = null; } - - method.reset(); - method = null; return true; } catch (Exception e) { LOGGER.error(MessageEnum.RA_CALLBACK_BPEL_EXC, "Camunda", "", MsoLogger.ErrorCode.BusinessProcesssError, @@ -155,6 +150,7 @@ public class BPRestCallback { if (httpResponse != null) { try { EntityUtils.consume(httpResponse.getEntity()); + httpResponse = null; } catch (Exception e) { LOGGER.debug("Exception:", e); } |