Merge "Fixed recent Sonar blocker issues"

1 files changed, 3 insertions, 10 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 750b7ace35..083a6b6e1f 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
@@ -130,19 +130,12 @@ public class AbstractCDSProcessingBBUtils implements CDSProcessingListener {
             ExecutionServiceInput executionServiceInput = (ExecutionServiceInput) execution
                     .getVariable("executionServiceInput");
 
-            //CDSProcessingListener cdsProcessingListener = new AbstractCDSProcessingBBUtils();
-
-            CDSProcessingClient cdsClient = null;
-            CountDownLatch countDownLatch;
-            try {
-                cdsClient = new CDSProcessingClient(this);
-                countDownLatch = cdsClient.sendRequest(executionServiceInput);
+            try(CDSProcessingClient cdsClient = new CDSProcessingClient(this)) {
+                CountDownLatch countDownLatch = cdsClient.sendRequest(executionServiceInput);
                 countDownLatch.await(props.getTimeout(), TimeUnit.SECONDS);
-            } catch (InterruptedException ex) {
+            } catch (InterruptedException ex){
                 logger.error("Caught exception in sendRequestToCDSClient in AbstractCDSProcessingBBUtils : ", ex);
                 Thread.currentThread().interrupt();
-            } finally {
-                cdsClient.close();
             }
 
             if (cdsResponse != null) {