Merge "Fixed sonar fix in DataSourceWrap.java"

1 files changed, 12 insertions, 14 deletions

diff --git a/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/util/db/DataSourceWrap.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/util/db/DataSourceWrap.java
index 2aebb83e3..259b9d8d9 100644
--- a/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/util/db/DataSourceWrap.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/util/db/DataSourceWrap.java
@@ -4,6 +4,7 @@
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
  *                         reserved.
+ * Modifications Copyright (C) 2018 IBM.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -74,25 +75,22 @@ public class DataSourceWrap implements DataSource {
 
     @Override
     public Connection getConnection() throws SQLException {
-        Connection c = dataSource.getConnection();
-
-        log.debug("getConnection: " + c.getClass().getName());
-
-        c.setAutoCommit(true);
-        return c;
+        try (Connection c = dataSource.getConnection()){
+            log.debug("getConnection: " + c.getClass().getName());
+            c.setAutoCommit(true);
+            return c;
+        }
     }
-
     @Override
     public Connection getConnection(String username, String password) throws SQLException {
-        Connection c = dataSource.getConnection(username, password);
-
-        log.debug("getConnection: " + c.getClass().getName());
-
-        c.setAutoCommit(true);
-        return c;
+        try (Connection c = dataSource.getConnection(username, password)){
+            log.debug("getConnection: " + c.getClass().getName());
+            c.setAutoCommit(true);
+            return c;
+        }
     }
 
-    public void setDataSource(DataSource dataSource) {
+        public void setDataSource(DataSource dataSource) {
         this.dataSource = dataSource;
     }
 }