Fixed Sonar blocker issues

Fixed blockers according to Sonar analysis.
Added tests for fixed issues.

Change-Id: I8e259147082d722961048454fae9484cc0d8b0a8
Issue-ID: SO-1734
Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>

1 files changed, 7 insertions, 3 deletions

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/cds/AbstractCDSProcessingBBUtils.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/cds/AbstractCDSProcessingBBUtils.java
index 7a967d3159..750b7ace35 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/cds/AbstractCDSProcessingBBUtils.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/cds/AbstractCDSProcessingBBUtils.java
@@ -4,6 +4,8 @@
  * ================================================================================
  * Copyright (C) 2019 TechMahindra
  * ================================================================================
+ * Modifications Copyright (c) 2019 Samsung
+ * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -130,13 +132,15 @@ public class AbstractCDSProcessingBBUtils implements CDSProcessingListener {
 
             //CDSProcessingListener cdsProcessingListener = new AbstractCDSProcessingBBUtils();
 
-            CDSProcessingClient cdsClient = new CDSProcessingClient(this);
-            CountDownLatch countDownLatch = cdsClient.sendRequest(executionServiceInput);
-
+            CDSProcessingClient cdsClient = null;
+            CountDownLatch countDownLatch;
             try {
+                cdsClient = new CDSProcessingClient(this);
+                countDownLatch = cdsClient.sendRequest(executionServiceInput);
                 countDownLatch.await(props.getTimeout(), TimeUnit.SECONDS);
             } catch (InterruptedException ex) {
                 logger.error("Caught exception in sendRequestToCDSClient in AbstractCDSProcessingBBUtils : ", ex);
+                Thread.currentThread().interrupt();
             } finally {
                 cdsClient.close();
             }