Merge "Revert "Fixed sonar fix in DataSourceWrap.java"" into dublin

1 files changed, 14 insertions, 12 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 259b9d8d..2aebb83e 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,7 +4,6 @@
  * ================================================================================
  * 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.
@@ -75,22 +74,25 @@ public class DataSourceWrap implements DataSource {
 
     @Override
     public Connection getConnection() throws SQLException {
-        try (Connection c = dataSource.getConnection()){
-            log.debug("getConnection: " + c.getClass().getName());
-            c.setAutoCommit(true);
-            return c;
-        }
+        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 {
-        try (Connection c = dataSource.getConnection(username, password)){
-            log.debug("getConnection: " + c.getClass().getName());
-            c.setAutoCommit(true);
-            return c;
-        }
+        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;
     }
 }