From: Ram Koya <rk541m@att.com>
Date: Fri, 31 Aug 2018 15:25:38 +0000 (+0000)
Subject: Merge "Sonar fix for DB.java"
X-Git-Tag: 1.0.1~27
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=4fe3669fbd63c06ab4d87ed371a49ab2ac9b066a;hp=d88f9be17654939fe085e6dc417220b3d7486556;p=dmaap%2Fdatarouter.git

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 bbcacb53..7f0d56b7 100644
--- 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;
                             }
                         }
+                        finally {
+                            if (connection != null && !connection.isValid(1)) {
+                                connection.close();
+                                connection = null;
+                            }
+                        }
                     } while (connection == null);
                 }
             }
-            if (connection != null && !connection.isValid(1)) {
-                connection.close();
-                connection = null;
-            }
+
         }
         return connection;
     }