Merge "Sonar fix for DB.java"

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DB.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DB.java
index bbcacb5..7f0d56b 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DB.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DB.java
@@ -112,13 +112,16 @@ public class DB {
                                 throw sqlEx;\r
                             }\r
                         }\r
+                        finally {\r
+                            if (connection != null && !connection.isValid(1)) {\r
+                                connection.close();\r
+                                connection = null;\r
+                            }\r
+                        }\r
                     } while (connection == null);\r
                 }\r
             }\r
-            if (connection != null && !connection.isValid(1)) {\r
-                connection.close();\r
-                connection = null;\r
-            }\r
+\r
         }\r
         return connection;\r
     }\r